Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0aa97561 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Russell King
Browse files

[ARM] 4970/1: tosa: correct gpio used for wake up. 



TOSA_GPIO_ON_KEY can't wakeup the device. But the board
provides TOSA_GPIO_POWERON which is OR of (on_ac) and (on_button).
Use it for wake up.

Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b168281c

arch/arm/mach-pxa/tosa.c

+17 −1
Original line number Diff line number Diff line
@@ -325,12 +325,28 @@ static struct platform_device tosakbd_device = { 
};



static struct gpio_keys_button tosa_gpio_keys[] = {

	/*

	 * Two following keys are directly tied to "ON" button of tosa. Why?

	 * The first one can be used as a wakeup source, the second can't;

	 * also the first one is OR of ac_powered and on_button.

	 */

	{

		.type	= EV_PWR,

		.code	= KEY_RESERVED,

		.gpio	= TOSA_GPIO_POWERON,

		.desc	= "Poweron",

		.wakeup	= 1,

		.active_low = 1,

	},

	{

		.type	= EV_PWR,

		.code	= KEY_SUSPEND,

		.gpio	= TOSA_GPIO_ON_KEY,

		.desc	= "On key",

		.wakeup	= 1,

		/*

		 * can't be used as wakeup

		 * .wakeup	= 1,

		 */

		.active_low = 1,

	},

	{