* [PATCH 1/2] ARM: mach-shmobile: armadillo800eva: Fix GPIO buttons descriptions
2012-08-27 6:40 Simon Horman
@ 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
2012-08-27 6:45 ` [GIT PULL] Renesas ARM-based SoC: Armadillo800EVA for 3.7 Simon Horman
2 siblings, 0 replies; 5+ 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>
The GPIO buttons are named SW3, SW4, SW5 and SW6 on the board
silkscreen. Update the buttons descriptions accordingly.
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 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index cf10f92..a002504 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -523,10 +523,10 @@ static struct platform_device hdmi_lcdc_device = {
#define GPIO_KEY(c, g, d) { .code = c, .gpio = g, .desc = d, .active_low = 1 }
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"),
+ 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 = {
--
1.7.10.2.484.gcd07cc5
^ permalink raw reply related [flat|nested] 5+ 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 ` [PATCH 1/2] ARM: mach-shmobile: armadillo800eva: Fix GPIO buttons descriptions Simon Horman
@ 2012-08-27 6:40 ` Simon Horman
2012-08-27 6:45 ` [GIT PULL] Renesas ARM-based SoC: Armadillo800EVA for 3.7 Simon Horman
2 siblings, 0 replies; 5+ 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] 5+ messages in thread* [GIT PULL] Renesas ARM-based SoC: Armadillo800EVA for 3.7
2012-08-27 6:40 Simon Horman
2012-08-27 6:40 ` [PATCH 1/2] ARM: mach-shmobile: armadillo800eva: Fix GPIO buttons descriptions Simon Horman
2012-08-27 6:40 ` [PATCH 2/2] ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source Simon Horman
@ 2012-08-27 6:45 ` Simon Horman
2012-08-28 0:05 ` Olof Johansson
2 siblings, 1 reply; 5+ messages in thread
From: Simon Horman @ 2012-08-27 6:45 UTC (permalink / raw)
To: linux-arm-kernel
Somehow I forgot to give the previous email a subject, not a good start :(
On Mon, Aug 27, 2012 at 03:40:08PM +0900, Simon Horman wrote:
> Hi Arnd, Hi Olaf,
>
> please consider the following enhancements for the Armadillo800EVA board
> from Laurent Pinchart for inclusion in 3.7.
>
> I am currently in the processes of taking over maintenance
> of shmoble from Rafael Wysocki and this my the first pull request
> in that role.
>
> ----------------------------------------------------------------
> The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:
>
> Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git armadillo800eva
>
> for you to fetch changes up to 5c1d2d16772e2d7d4e2e8da99a92d6f50b9102f0:
>
> ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source (2012-08-25 15:44:53 +0900)
>
> ----------------------------------------------------------------
> Laurent Pinchart (2):
> ARM: mach-shmobile: armadillo800eva: Fix GPIO buttons descriptions
> ARM: mach-shmobile: armadillo800eva: Enable power button as wakeup source
>
> arch/arm/mach-shmobile/board-armadillo800eva.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [GIT PULL] Renesas ARM-based SoC: Armadillo800EVA for 3.7
2012-08-27 6:45 ` [GIT PULL] Renesas ARM-based SoC: Armadillo800EVA for 3.7 Simon Horman
@ 2012-08-28 0:05 ` Olof Johansson
0 siblings, 0 replies; 5+ messages in thread
From: Olof Johansson @ 2012-08-28 0:05 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Aug 27, 2012 at 03:45:06PM +0900, Simon Horman wrote:
> Somehow I forgot to give the previous email a subject, not a good start :(
>
> On Mon, Aug 27, 2012 at 03:40:08PM +0900, Simon Horman wrote:
> > Hi Arnd, Hi Olaf,
> >
> > please consider the following enhancements for the Armadillo800EVA board
> > from Laurent Pinchart for inclusion in 3.7.
> >
> > I am currently in the processes of taking over maintenance
> > of shmoble from Rafael Wysocki and this my the first pull request
> > in that role.
> >
> > ----------------------------------------------------------------
> > The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:
> >
> > Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git armadillo800eva
Thanks, pulled.
-Olof
^ permalink raw reply [flat|nested] 5+ messages in thread