| Message ID | 1366194847-9879-2-git-send-email-hechtb+renesas@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | 81b57f571e114094ce1aeaed7939799710620f6c |
| Headers | show |
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);
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. -- 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
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);
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(-)