From b18773d545e65fe442479e3f9853c8ebb8ec45d6 Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Mon, 2 Jun 2008 17:41:42 +0800 Subject: [PATCH] [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 Signed-off-by: Russell King --- arch/arm/mach-pxa/mainstone.c | 6 +++--- 1 file 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[] = { 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, -- 2.20.1