Changeset 4090

Timestamp:

02/21/08 05:16:03 (5 years ago)

Author:

werner

Message:

Second part of suspend-prelim2.bin by Matt Hsu:

Remove AUX key as wake up source [so that we can resume even if the
NOR has no valid content].

gta01-inputdevice.patch:

• drivers/input/keyboard/neo1973kbd.c (neo1973kbd_probe): add AUX as a wakeup interrupt source only if on GTA01

File:

• branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch (modified) (5 diffs)

branches/src/target/kernel/2.6.24.x/patches/gta01-inputdevice.patch

@@ -3 +3 @@
 Signed-off-by: Harald Welte <laforge@openmoko.org>
 
-Index: linux-2.6/drivers/input/keyboard/Kconfig
+Index: linux-2.6.24/drivers/input/keyboard/Kconfig
 ===================================================================
---- linux-2.6.orig/drivers/input/keyboard/Kconfig
-+++ linux-2.6/drivers/input/keyboard/Kconfig
-@@ -293,4 +293,16 @@
+--- linux-2.6.24.orig/drivers/input/keyboard/Kconfig
++++ linux-2.6.24/drivers/input/keyboard/Kconfig
+@@ -293,4 +293,16 @@ config KEYBOARD_BFIN
           To compile this driver as a module, choose M here: the
           module will be called bf54x-keys.
@@ -24 +24 @@
 +
  endif
-Index: linux-2.6/drivers/input/keyboard/Makefile
+Index: linux-2.6.24/drivers/input/keyboard/Makefile
 ===================================================================
---- linux-2.6.orig/drivers/input/keyboard/Makefile
-+++ linux-2.6/drivers/input/keyboard/Makefile
-@@ -14,6 +14,7 @@
+--- linux-2.6.24.orig/drivers/input/keyboard/Makefile
++++ linux-2.6.24/drivers/input/keyboard/Makefile
+@@ -14,6 +14,7 @@ obj-$(CONFIG_KEYBOARD_LOCOMO)         += locomo
  obj-$(CONFIG_KEYBOARD_NEWTON)          += newtonkbd.o
  obj-$(CONFIG_KEYBOARD_STOWAWAY)                += stowaway.o
@@ -36 +36 @@
  obj-$(CONFIG_KEYBOARD_HIL)             += hil_kbd.o
  obj-$(CONFIG_KEYBOARD_HIL_OLD)         += hilkbd.o
-Index: linux-2.6/drivers/input/keyboard/neo1973kbd.c
+Index: linux-2.6.24/drivers/input/keyboard/neo1973kbd.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6/drivers/input/keyboard/neo1973kbd.c
-@@ -0,0 +1,236 @@
++++ linux-2.6.24/drivers/input/keyboard/neo1973kbd.c
+@@ -0,0 +1,239 @@
 +/*
 + * Keyboard driver for FIC Neo1973 GSM phone
@@ -67 +67 @@
 +#include <asm/hardware.h>
 +#include <asm/arch/gta01.h>
++#include <asm/mach-types.h>
 +
 +struct neo1973kbd {
@@ -201 +202 @@
 +               goto out_aux;
 +       }
-+       enable_irq_wake(irq_aux);
++
++       if (machine_is_neo1973_gta01())
++               enable_irq_wake(irq_aux);
 +
 +       if (request_irq(irq_hold, neo1973kbd_hold_irq, IRQF_DISABLED |