r4119 - branches/src/target/kernel/2.6.24.x/patches

[werner at sita.openmoko.org]

Author: werner
Date: 2008-02-27 05:18:28 +0100 (Wed, 27 Feb 2008)
New Revision: 4119

Modified:
   branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch
Log:
Oops, didn't mean to break GTA01Bv3.

gta01-inputdevice.patch: 
- drivers/input/keyboard/neo1973kbd.c (neo1973kbd_probe): reverted change in 
  r4114 and made AUX a wakeup source for GTA01 again
- drivers/input/keyboard/neo1973kbd.c (neo1973kbd_probe): added a comment 
  explaining why



Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch	2008-02-26 12:07:53 UTC (rev 4118)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch	2008-02-27 04:18:28 UTC (rev 4119)
@@ -39,7 +39,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.24/drivers/input/keyboard/neo1973kbd.c
-@@ -0,0 +1,235 @@
+@@ -0,0 +1,243 @@
 +/*
 + * Keyboard driver for FIC Neo1973 GSM phone
 + *
@@ -66,6 +66,7 @@
 +
 +#include <asm/hardware.h>
 +#include <asm/arch/gta01.h>
++#include <asm/mach-types.h>
 +
 +struct neo1973kbd {
 +	struct input_dev *input;
@@ -201,6 +202,13 @@
 +		goto out_aux;
 +	}
 +
++	/*
++	 * GTA01 revisions before Bv4 can't be resumed by the PMU, so we use
++	 * resume by AUX.
++	 */
++	if (machine_is_neo1973_gta01())
++		enable_irq_wake(irq_aux);
++
 +	if (request_irq(irq_hold, neo1973kbd_hold_irq, IRQF_DISABLED |
 +			IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
 +			"Neo1973 HOLD button", neo1973kbd)) {