diff options
| author |   Vasily Khoruzhick <anarsoul@gmail.com> | 2011-03-13 17:19:17 +0200 |
|---|---|---|
| committer |   Marek Vasut <marek.vasut@gmail.com> | 2011-03-16 14:56:02 +0100 |
| commit | 2e62344de8e2a7e402fe2a009c3d09bc6fd589e6 (patch) | |
| tree | 17b8e0ed84d539278277734aaace78c87f85bd7a /arch/arm/mach-pxa/z2.c | |
| parent | ARM: pxafb: don't disable controller on cpufreq transition if overlay in use (diff) | |
| download | linux-dev-2e62344de8e2a7e402fe2a009c3d09bc6fd589e6.tar.xz linux-dev-2e62344de8e2a7e402fe2a009c3d09bc6fd589e6.zip | |
ARM: PXA: Z2: Use only power button as wake source
It's very easy to press some keypad key when Z2 is closed,
so to prevent unexpected wakeups, use only 'Power' key to wake
Z2 from sleep.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/z2.c')
| -rw-r--r-- | arch/arm/mach-pxa/z2.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c index 084c724c1569..db6199c74ebb 100644 --- a/arch/arm/mach-pxa/z2.c +++ b/arch/arm/mach-pxa/z2.c @@ -92,13 +92,13 @@ static unsigned long z2_pin_config[] = { GPIO47_STUART_TXD, /* Keypad */ - GPIO100_KP_MKIN_0 | WAKEUP_ON_LEVEL_HIGH, - GPIO101_KP_MKIN_1 | WAKEUP_ON_LEVEL_HIGH, - GPIO102_KP_MKIN_2 | WAKEUP_ON_LEVEL_HIGH, - GPIO34_KP_MKIN_3 | WAKEUP_ON_LEVEL_HIGH, - GPIO38_KP_MKIN_4 | WAKEUP_ON_LEVEL_HIGH, - GPIO16_KP_MKIN_5 | WAKEUP_ON_LEVEL_HIGH, - GPIO17_KP_MKIN_6 | WAKEUP_ON_LEVEL_HIGH, + GPIO100_KP_MKIN_0, + GPIO101_KP_MKIN_1, + GPIO102_KP_MKIN_2, + GPIO34_KP_MKIN_3, + GPIO38_KP_MKIN_4, + GPIO16_KP_MKIN_5, + GPIO17_KP_MKIN_6, GPIO103_KP_MKOUT_0, GPIO104_KP_MKOUT_1, GPIO105_KP_MKOUT_2, @@ -428,8 +428,22 @@ static inline void z2_mkp_init(void) {} ******************************************************************************/ #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE) static struct gpio_keys_button z2_pxa_buttons[] = { - {KEY_POWER, GPIO1_ZIPITZ2_POWER_BUTTON, 0, "Power Button" }, - {KEY_CLOSE, GPIO98_ZIPITZ2_LID_BUTTON, 0, "Lid Button" }, + { + .code = KEY_POWER, + .gpio = GPIO1_ZIPITZ2_POWER_BUTTON, + .active_low = 0, + .desc = "Power Button", + .wakeup = 1, + .type = EV_KEY, + }, + { + .code = KEY_CLOSE, + .gpio = GPIO98_ZIPITZ2_LID_BUTTON, + .active_low = 0, + .desc = "Lid Button", + .wakeup = 0 + .type = EV_KEY, + }, }; static struct gpio_keys_platform_data z2_pxa_keys_data = { |