diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-27 09:00:31 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-27 09:03:13 +0200 |
commit | 7ef38c1996ad29fc36722797a9c03127adc831ff (patch) | |
tree | f5aeb2cc3d66656e69256840319483e21f38ce02 /recipes | |
parent | d9cd4d5da67213ce9744682f3f446c6d19a09212 (diff) |
linux-openmoko-2.6.34: upgrade to 2.6.34.6 and add patch for WSOD with 242 timming
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes')
-rw-r--r-- | recipes/linux/linux-openmoko-2.6.34/0009-glamo-display-fix-WSOD-for-242-timming.patch | 39 | ||||
-rw-r--r-- | recipes/linux/linux-openmoko-2.6.34_git.bb | 7 |
2 files changed, 43 insertions, 3 deletions
diff --git a/recipes/linux/linux-openmoko-2.6.34/0009-glamo-display-fix-WSOD-for-242-timming.patch b/recipes/linux/linux-openmoko-2.6.34/0009-glamo-display-fix-WSOD-for-242-timming.patch new file mode 100644 index 0000000000..1a645d01a3 --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.34/0009-glamo-display-fix-WSOD-for-242-timming.patch @@ -0,0 +1,39 @@ +From 2262b75d6035fb15f555d0d019def3ad1c35c997 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Fri, 27 Aug 2010 08:52:07 +0200 +Subject: [PATCH] glamo-display: fix WSOD for 242 timming + +--- + drivers/gpu/drm/glamo/glamo-display.c | 2 +- + drivers/video/glamo-fb.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/glamo/glamo-display.c b/drivers/gpu/drm/glamo/glamo-display.c +index 4e85906..0c02e66 100644 +--- a/drivers/gpu/drm/glamo/glamo-display.c ++++ b/drivers/gpu/drm/glamo/glamo-display.c +@@ -178,7 +178,7 @@ int glamo_lcd_cmd_mode(struct glamodrm_handle *gdrm, int on) + reg_write_lcd(gdrm, GLAMO_REG_LCD_COMMAND1, + GLAMO_LCD_CMD_TYPE_DISP | + GLAMO_LCD_CMD_DATA_DISP_SYNC); +- ++ mdelay(1); + reg_write_lcd(gdrm, GLAMO_REG_LCD_COMMAND1, + GLAMO_LCD_CMD_TYPE_DISP | + GLAMO_LCD_CMD_DATA_DISP_FIRE); +diff --git a/drivers/video/glamo-fb.c b/drivers/video/glamo-fb.c +index 3f8ec8d..a428047 100644 +--- a/drivers/video/glamo-fb.c ++++ b/drivers/video/glamo-fb.c +@@ -312,7 +312,7 @@ static int glamofb_cmd_mode(struct glamofb_handle *gfb, int on) + glamofb_reg_write(gfb, GLAMO_REG_LCD_COMMAND1, + GLAMO_LCD_CMD_TYPE_DISP | + GLAMO_LCD_CMD_DATA_DISP_SYNC); +- ++ mdelay(1); + glamofb_reg_write(gfb, GLAMO_REG_LCD_COMMAND1, + GLAMO_LCD_CMD_TYPE_DISP | + GLAMO_LCD_CMD_DATA_DISP_FIRE); +-- +1.7.2.2 + diff --git a/recipes/linux/linux-openmoko-2.6.34_git.bb b/recipes/linux/linux-openmoko-2.6.34_git.bb index 8d875f3709..a1eae7719e 100644 --- a/recipes/linux/linux-openmoko-2.6.34_git.bb +++ b/recipes/linux/linux-openmoko-2.6.34_git.bb @@ -1,7 +1,7 @@ require linux.inc require linux-openmoko.inc -KERNEL_RELEASE="2.6.34.5" +KERNEL_RELEASE="2.6.34.6" SRCREV = "3f6725d43021d2d7597027e36020df5b44d0667e" OEV = "oe4.6" @@ -26,6 +26,7 @@ SRC_URI = "\ file://0007-Fix-claim-of-2D-register-resource.patch \ file://0008-Use-unlocked_ioctl-rather-than-ioctl.patch \ file://0001-glamo-display-Enable-FIFO-stage-for-the-LCD-engine-s.patch \ + file://0009-glamo-display-fix-WSOD-for-242-timming.patch \ # patches from Radek Polak used in qtmoko file://0001-accels.patch.patch \ file://0002-usbhost.patch.patch \ @@ -36,8 +37,8 @@ SRC_URI = "\ file://defconfig \ " -SRC_URI[stablepatch.md5sum] = "8a4d2f75b2e09edb20de304c4f2240f6" -SRC_URI[stablepatch.sha256sum] = "bd029f2e218f95861ec84e6a2344a345012cfb4a6d172cbc2f80917343a85141" +SRC_URI[stablepatch.md5sum] = "49d8234d88bba062edcab19fd0ee28b4" +SRC_URI[stablepatch.sha256sum] = "a62e9392ad435948ea4ea2cce12e60e042da6e6da806691936ba50bbaa0dc8cc" S = "${WORKDIR}/git" |