* [PATCH v2 2/6] ARM: shmobile: Armadillo800EVA: Convert SCIFA1 to pinctrl
@ 2013-04-17 10:34 Bastian Hecht
2013-04-17 11:36 ` Laurent Pinchart
2013-04-18 12:34 ` Simon Horman
0 siblings, 2 replies; 3+ messages in thread
From: Bastian Hecht @ 2013-04-17 10:34 UTC (permalink / raw)
To: linux-sh
We use the new pinctrl framework now.
Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
---
v2: same
arch/arm/mach-shmobile/board-armadillo800eva.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 81db74a..bf4c3d2 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1048,6 +1048,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = {
"mmc0_data8_1", "mmc0"),
PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-r8a7740",
"mmc0_ctrl_1", "mmc0"),
+ /* SCIFA1 */
+ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "pfc-r8a7740",
+ "scifa1_data", "scifa1"),
/* SDHI0 */
PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7740",
"sdhi0_data4", "sdhi0"),
@@ -1109,10 +1112,6 @@ static void __init eva_init(void)
r8a7740_pinmux_init();
r8a7740_meram_workaround();
- /* SCIFA1 */
- gpio_request(GPIO_FN_SCIFA1_RXD, NULL);
- gpio_request(GPIO_FN_SCIFA1_TXD, NULL);
-
/* LCDC0 */
gpio_request(GPIO_FN_LCDC0_SELECT, NULL);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2 2/6] ARM: shmobile: Armadillo800EVA: Convert SCIFA1 to pinctrl
2013-04-17 10:34 [PATCH v2 2/6] ARM: shmobile: Armadillo800EVA: Convert SCIFA1 to pinctrl Bastian Hecht
@ 2013-04-17 11:36 ` Laurent Pinchart
2013-04-18 12:34 ` Simon Horman
1 sibling, 0 replies; 3+ messages in thread
From: Laurent Pinchart @ 2013-04-17 11:36 UTC (permalink / raw)
To: linux-sh
Hi Bastian,
Thank you for the patch.
On Wednesday 17 April 2013 12:34:02 Bastian Hecht wrote:
> We use the new pinctrl framework now.
>
> Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> v2: same
>
> arch/arm/mach-shmobile/board-armadillo800eva.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c
> b/arch/arm/mach-shmobile/board-armadillo800eva.c index 81db74a..bf4c3d2
> 100644
> --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
> +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
> @@ -1048,6 +1048,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = {
> "mmc0_data8_1", "mmc0"),
> PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-r8a7740",
> "mmc0_ctrl_1", "mmc0"),
> + /* SCIFA1 */
> + PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "pfc-r8a7740",
> + "scifa1_data", "scifa1"),
> /* SDHI0 */
> PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7740",
> "sdhi0_data4", "sdhi0"),
> @@ -1109,10 +1112,6 @@ static void __init eva_init(void)
> r8a7740_pinmux_init();
> r8a7740_meram_workaround();
>
> - /* SCIFA1 */
> - gpio_request(GPIO_FN_SCIFA1_RXD, NULL);
> - gpio_request(GPIO_FN_SCIFA1_TXD, NULL);
> -
> /* LCDC0 */
> gpio_request(GPIO_FN_LCDC0_SELECT, NULL);
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2 2/6] ARM: shmobile: Armadillo800EVA: Convert SCIFA1 to pinctrl
2013-04-17 10:34 [PATCH v2 2/6] ARM: shmobile: Armadillo800EVA: Convert SCIFA1 to pinctrl Bastian Hecht
2013-04-17 11:36 ` Laurent Pinchart
@ 2013-04-18 12:34 ` Simon Horman
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2013-04-18 12:34 UTC (permalink / raw)
To: linux-sh
On Wed, Apr 17, 2013 at 01:36:45PM +0200, Laurent Pinchart wrote:
> Hi Bastian,
>
> Thank you for the patch.
>
> On Wednesday 17 April 2013 12:34:02 Bastian Hecht wrote:
> > We use the new pinctrl framework now.
> >
> > Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Thanks, I have merged the pinmux branch into the
boards-armadillo800eva branch and queued-up this patch
for v3.11 there.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-18 12:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-17 10:34 [PATCH v2 2/6] ARM: shmobile: Armadillo800EVA: Convert SCIFA1 to pinctrl Bastian Hecht
2013-04-17 11:36 ` Laurent Pinchart
2013-04-18 12:34 ` Simon Horman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.