linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2] ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source
@ 2012-07-24 13:26 Laurent Pinchart
  2012-08-01  4:58 ` Simon Horman
  0 siblings, 1 reply; 3+ messages in thread
From: Laurent Pinchart @ 2012-07-24 13:26 UTC (permalink / raw)
  To: linux-sh

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 arch/arm/mach-shmobile/board-armadillo800eva.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 04cb65a..a70993f 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -412,10 +412,11 @@ static struct platform_device lcdc0_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"),
-- 
1.7.8.6


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 2/2] ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source
  2012-07-24 13:26 [PATCH 2/2] ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source Laurent Pinchart
@ 2012-08-01  4:58 ` Simon Horman
  0 siblings, 0 replies; 3+ messages in thread
From: Simon Horman @ 2012-08-01  4:58 UTC (permalink / raw)
  To: linux-sh

On Tue, Jul 24, 2012 at 03:26:09PM +0200, Laurent Pinchart wrote:
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  arch/arm/mach-shmobile/board-armadillo800eva.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)

Tested-by: Simon Horman <horms@verge.net.au>



^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 2/2] ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source
  2012-08-27  6:40 Simon Horman
@ 2012-08-27  6:40 ` Simon Horman
  0 siblings, 0 replies; 3+ messages in thread
From: Simon Horman @ 2012-08-27  6:40 UTC (permalink / raw)
  To: linux-arm-kernel

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

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 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index a002504..65cb793 100644
--- 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"),
-- 
1.7.10.2.484.gcd07cc5


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-08-27  6:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-24 13:26 [PATCH 2/2] ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source Laurent Pinchart
2012-08-01  4:58 ` Simon Horman
  -- strict thread matches above, loose matches on Subject: below --
2012-08-27  6:40 Simon Horman
2012-08-27  6:40 ` [PATCH 2/2] ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source Simon Horman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).