projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2d85b94)
ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Tue, 24 Jul 2012 13:26:09 +0000 (15:26 +0200)
committerSimon Horman <horms@verge.net.au>
Sat, 25 Aug 2012 06:44:53 +0000 (15:44 +0900)
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
arch/arm/mach-shmobile/board-armadillo800eva.c patch | blob | blame | history

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index a002504e3236a1f0f27151b5e33c4529468c0fd4..65cb7936ed9e11fa88e8313d0803d15ebadf81a9 100644 (file)
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -520,10 +520,11 @@ 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,    "SW3"),
+       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"),