diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2013-11-20 19:04:50 +0100 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2013-12-02 10:47:21 +0100 |
commit | 6f250fa224375b4fa858fda890b7cd0136173b7c (patch) | |
tree | f958d0e1a9f5462873e108eadfcdebcc8390b070 /arch/arm/mach-tegra/board-colibri_t20.c | |
parent | 727d07b6e389b799584708c54431210fcce519ea (diff) |
colibri_t20/colibri_t30: don't register KEY_BACK for wakeup
The port used for KEY_BACK does not support wakeup (no wake PIN). Remove
the wake flag, this prevents unbalanced irq warning messages.
Diffstat (limited to 'arch/arm/mach-tegra/board-colibri_t20.c')
-rw-r--r-- | arch/arm/mach-tegra/board-colibri_t20.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t20.c b/arch/arm/mach-tegra/board-colibri_t20.c index 299ba2d5c345..f7153ab6a50b 100644 --- a/arch/arm/mach-tegra/board-colibri_t20.c +++ b/arch/arm/mach-tegra/board-colibri_t20.c @@ -554,12 +554,14 @@ static void colibri_t20_i2c_init(void) } /* Keys - Note: active-low means pull-ups required on carrier board resp. via - pin-muxing - Note2: power-key active-high due to EvalBoard v3.1a having 100 K pull-down - on SODIMM pin 45 - Note3: menu-key active-high due to strong pull-down on multiplexed - ACC1_DETECT */ + * Note: active-low means pull-ups required on carrier board resp. via + * pin-muxing + * Note2: power-key active-high due to EvalBoard v3.1a having 100 K pull-down + * on SODIMM pin 45 + * Note3: menu-key active-high due to strong pull-down on multiplexed + * ACC1_DETECT + * Note4: Wake keys need to be supported by hardware, see wakeups-t2.h + */ #ifdef CONFIG_KEYBOARD_GPIO #define GPIO_KEY(_id, _gpio, _lowactive, _iswake) \ @@ -576,7 +578,7 @@ static void colibri_t20_i2c_init(void) static struct gpio_keys_button colibri_t20_keys[] = { GPIO_KEY(KEY_FIND, PT3, 1, 0), /* SODIMM pin 77 */ GPIO_KEY(KEY_HOME, PBB3, 1, 0), /* SODIMM pin 127 */ - GPIO_KEY(KEY_BACK, PBB2, 1, 1), /* SODIMM pin 133, + GPIO_KEY(KEY_BACK, PBB2, 1, 0), /* SODIMM pin 133, Iris X16-14 */ GPIO_KEY(KEY_VOLUMEUP, PBB4, 1, 0), /* SODIMM pin 22 */ GPIO_KEY(KEY_VOLUMEDOWN, PBB5, 1, 0), /* SODIMM pin 24 */ |