diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-04-12 20:02:50 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 11:29:08 +0100 |
| commit | 0aa975613320fcd8434087b6d61ef6990ec24e7d (patch) | |
| tree | 52a71039a12ea90cb663a2b7aa7600fe3c83f72b /arch/arm/mach-pxa/tosa.c | |
| parent | b168281c07adf0a13f17368532fe787f1d23fd30 (diff) | |
| download | kernel_replicant_linux-0aa975613320fcd8434087b6d61ef6990ec24e7d.tar.gz kernel_replicant_linux-0aa975613320fcd8434087b6d61ef6990ec24e7d.tar.bz2 kernel_replicant_linux-0aa975613320fcd8434087b6d61ef6990ec24e7d.zip | |
[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: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/tosa.c')
| -rw-r--r-- | arch/arm/mach-pxa/tosa.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index df65e89d1934..9f5ca5497bb9 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c @@ -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, }, { |