]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] pxa: remove WAKEUP_ON_LEVEL_HIGH from keypad direct keys
authorEric Miao <eric.miao@marvell.com>
Mon, 2 Jun 2008 09:41:42 +0000 (17:41 +0800)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 9 Jul 2008 20:38:31 +0000 (21:38 +0100)
Setting PKWR bits on those pins will make the resuming from
low power state to fail.

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-pxa/mainstone.c

index 6c3c37ccf5867cfe084e797886327cda2c63c3cf..5b145fa739604d58cfe1cfcd6d00047715e63a38 100644 (file)
@@ -110,9 +110,9 @@ static unsigned long mainstone_pin_config[] = {
        GPIO45_AC97_SYSCLK,
 
        /* Keypad */
-       GPIO93_KP_DKIN_0        | WAKEUP_ON_LEVEL_HIGH,
-       GPIO94_KP_DKIN_1        | WAKEUP_ON_LEVEL_HIGH,
-       GPIO95_KP_DKIN_2        | WAKEUP_ON_LEVEL_HIGH,
+       GPIO93_KP_DKIN_0,
+       GPIO94_KP_DKIN_1,
+       GPIO95_KP_DKIN_2,
        GPIO100_KP_MKIN_0       | WAKEUP_ON_LEVEL_HIGH,
        GPIO101_KP_MKIN_1       | WAKEUP_ON_LEVEL_HIGH,
        GPIO102_KP_MKIN_2       | WAKEUP_ON_LEVEL_HIGH,