[PATCH 1/8] ARM: PXA: Z2: Use only power button as wake source

[Marek Vasut]

On Friday 11 March 2011 11:23:36 Vasily Khoruzhick wrote:
> 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 at gmail.com>
> ---
>  arch/arm/mach-pxa/z2.c |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
> index aaf8837..7bad4f7 100644
> --- a/arch/arm/mach-pxa/z2.c
> +++ b/arch/arm/mach-pxa/z2.c
> @@ -91,13 +91,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	/*| 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*/,

These commented-out crap is bogus, please remove.

>  	GPIO103_KP_MKOUT_0,
>  	GPIO104_KP_MKOUT_1,
>  	GPIO105_KP_MKOUT_2,
> @@ -427,8 +427,8 @@ 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" },
> +	{KEY_POWER, GPIO1_ZIPITZ2_POWER_BUTTON, 0, "Power Button", 1 },
> +	{KEY_CLOSE, GPIO98_ZIPITZ2_LID_BUTTON, 0, "Lid Button", 0 },
>  };
> 
>  static struct gpio_keys_platform_data z2_pxa_keys_data = {