diff options
| author | Olof Johansson <olof@lixom.net> | 2012-08-27 17:07:45 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-08-27 17:07:45 -0700 |
| commit | aa9f6d6b1be17fb84cd62e19f8d997b378b1c852 (patch) | |
| tree | 2a6389c867b74d05f7b9e2017c6ec9861fd2b350 /arch/arm | |
| parent | 981ba65715f28c5d0247c71e49e2917f40b61632 (diff) | |
| parent | 5c1d2d16772e2d7d4e2e8da99a92d6f50b9102f0 (diff) | |
| download | linux-3.10-aa9f6d6b1be17fb84cd62e19f8d997b378b1c852.tar.gz linux-3.10-aa9f6d6b1be17fb84cd62e19f8d997b378b1c852.tar.bz2 linux-3.10-aa9f6d6b1be17fb84cd62e19f8d997b378b1c852.zip | |
Merge branch 'armadillo800eva' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
* 'armadillo800eva' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source
ARM: mach-shmobile: armadillo800eva: Fix GPIO buttons descriptions
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index cf10f92856d..65cb7936ed9 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -520,13 +520,14 @@ static struct platform_device hdmi_lcdc_device = { }; /* GPIO KEY */ -#define GPIO_KEY(c, g, d) { .code = c, .gpio = g, .desc = d, .active_low = 1 } +#define GPIO_KEY(c, g, d, ...) \ + { .code = c, .gpio = g, .desc = d, .active_low = 1, __VA_ARGS__ } static struct gpio_keys_button gpio_buttons[] = { - GPIO_KEY(KEY_POWER, GPIO_PORT99, "SW1"), - GPIO_KEY(KEY_BACK, GPIO_PORT100, "SW2"), - GPIO_KEY(KEY_MENU, GPIO_PORT97, "SW3"), - GPIO_KEY(KEY_HOME, GPIO_PORT98, "SW4"), + GPIO_KEY(KEY_POWER, GPIO_PORT99, "SW3", .wakeup = 1), + GPIO_KEY(KEY_BACK, GPIO_PORT100, "SW4"), + GPIO_KEY(KEY_MENU, GPIO_PORT97, "SW5"), + GPIO_KEY(KEY_HOME, GPIO_PORT98, "SW6"), }; static struct gpio_keys_platform_data gpio_key_info = { |