diff options
| author | Eric Miao <eric.miao@marvell.com> | 2008-06-02 05:41:42 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 16:38:31 -0400 |
| commit | b18773d545e65fe442479e3f9853c8ebb8ec45d6 (patch) | |
| tree | 07c64e74f83b407a894e7c8eb926a1fee5dfbe89 /arch | |
| parent | 36caeb4ec147dacb04e723080816e78f288f47cc (diff) | |
[ARM] pxa: remove WAKEUP_ON_LEVEL_HIGH from keypad direct keys
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 6c3c37ccf586..5b145fa73960 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
| @@ -110,9 +110,9 @@ static unsigned long mainstone_pin_config[] = { | |||
| 110 | GPIO45_AC97_SYSCLK, | 110 | GPIO45_AC97_SYSCLK, |
| 111 | 111 | ||
| 112 | /* Keypad */ | 112 | /* Keypad */ |
| 113 | GPIO93_KP_DKIN_0 | WAKEUP_ON_LEVEL_HIGH, | 113 | GPIO93_KP_DKIN_0, |
| 114 | GPIO94_KP_DKIN_1 | WAKEUP_ON_LEVEL_HIGH, | 114 | GPIO94_KP_DKIN_1, |
| 115 | GPIO95_KP_DKIN_2 | WAKEUP_ON_LEVEL_HIGH, | 115 | GPIO95_KP_DKIN_2, |
| 116 | GPIO100_KP_MKIN_0 | WAKEUP_ON_LEVEL_HIGH, | 116 | GPIO100_KP_MKIN_0 | WAKEUP_ON_LEVEL_HIGH, |
| 117 | GPIO101_KP_MKIN_1 | WAKEUP_ON_LEVEL_HIGH, | 117 | GPIO101_KP_MKIN_1 | WAKEUP_ON_LEVEL_HIGH, |
| 118 | GPIO102_KP_MKIN_2 | WAKEUP_ON_LEVEL_HIGH, | 118 | GPIO102_KP_MKIN_2 | WAKEUP_ON_LEVEL_HIGH, |