diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-06-27 16:01:53 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-06-28 08:43:59 +0200 |
| commit | 036a0fcada952d8cf9e2f1360071730812ee1da6 (patch) | |
| tree | baa9f86fea2c814237dfa2c5685a224f0f3a8804 /recipes/linux | |
| parent | c93524aff238f25adc24dd99efa1b2c45dac89a5 (diff) | |
linux-openmoko-2.6.32: add patch with possible WS fix
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/linux')
| -rw-r--r-- | recipes/linux/linux-openmoko-2.6.32/0001-glamo-core-initialize-engine-states-as-disabled.patch | 36 | ||||
| -rw-r--r-- | recipes/linux/linux-openmoko-2.6.32_git.bb | 4 |
2 files changed, 39 insertions, 1 deletions
diff --git a/recipes/linux/linux-openmoko-2.6.32/0001-glamo-core-initialize-engine-states-as-disabled.patch b/recipes/linux/linux-openmoko-2.6.32/0001-glamo-core-initialize-engine-states-as-disabled.patch new file mode 100644 index 0000000000..1ba29f4092 --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.32/0001-glamo-core-initialize-engine-states-as-disabled.patch @@ -0,0 +1,36 @@ +From 41d32b16473f81ec94cd51ed51fdc6f54e1f76d6 Mon Sep 17 00:00:00 2001 +From: Thibaut Girka <thib@sitedethib.com> +Date: Fri, 25 Jun 2010 20:17:18 +0200 +Subject: [PATCH] glamo-core: initialize engine states as disabled + +This should fix random init failures such as white screen on boot. +--- + drivers/mfd/glamo/glamo-core.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c +index 33a7a59..f6674f4 100644 +--- a/drivers/mfd/glamo/glamo-core.c ++++ b/drivers/mfd/glamo/glamo-core.c +@@ -916,7 +916,7 @@ static int __devinit glamo_supported(struct glamo_core *glamo) + + static int __devinit glamo_probe(struct platform_device *pdev) + { +- int ret = 0, irq, irq_base; ++ int ret = 0, n, irq, irq_base; + struct glamo_core *glamo; + struct resource *mem; + +@@ -924,6 +924,9 @@ static int __devinit glamo_probe(struct platform_device *pdev) + if (!glamo) + return -ENOMEM; + ++ for (n = 0; n < __NUM_GLAMO_ENGINES; n++) ++ glamo->engine_state[n] = GLAMO_ENGINE_DISABLED; ++ + spin_lock_init(&glamo->lock); + + glamo->pdev = pdev; +-- +1.7.1 + diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb index dfae93104b..56e8698bf4 100644 --- a/recipes/linux/linux-openmoko-2.6.32_git.bb +++ b/recipes/linux/linux-openmoko-2.6.32_git.bb @@ -4,7 +4,7 @@ require linux-openmoko.inc KERNEL_RELEASE="2.6.32.13" SRCREV = "a9254be10ac2294ea20165a87c09ea6afcf66d94" -OEV = "oe3" +OEV = "oe3.1" PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}" SRC_URI = "\ @@ -34,6 +34,8 @@ SRC_URI = "\ file://0014-Fix-claim-of-2D-register-resource.patch \ # fix for lost touchscreen https://docs.openmoko.org/trac/ticket/2328 file://touchscreen_ignoreunexpectedintr29.patch \ +# fix WS + file://0001-glamo-core-initialize-engine-states-as-disabled.patch \ " SRC_URI[stablepatch.md5sum] = "ba6abb1ffee513a1d4f831599ddae490" |