[PATCH 2/6] ARM: shmobile: Armadillo800EVA: Convert SCIFA1 to pinctrl

[PATCH 2/6] ARM: shmobile: Armadillo800EVA: Convert SCIFA1 to pinctrl

[Bastian Hecht]

We use the new pinctrl framework now.

Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
---
 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..2914b6e 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1036,6 +1036,9 @@ static struct platform_device *eva_devices[] __initdata = {
 };
 
 static const struct pinctrl_map eva_pinctrl_map[] = {
+	/* SCIFA1 */
+	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "pfc-r8a7740",
+				  "scifa1_data", "scifa1"),
 	/* LCD0 */
 	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-r8a7740",
 				  "lcd0_data24_0", "lcd0"),
@@ -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

Re: [PATCH 2/6] ARM: shmobile: Armadillo800EVA: Convert SCIFA1 to pinctrl

[Laurent Pinchart]

Hi Bastian,

Thanks for the patch.

On Thursday 04 April 2013 15:45:40 Bastian Hecht wrote:
> We use the new pinctrl framework now.
> 
> Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
> ---
>  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..2914b6e
> 100644
> --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
> +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
> @@ -1036,6 +1036,9 @@ static struct platform_device *eva_devices[]
> __initdata = { };
> 
>  static const struct pinctrl_map eva_pinctrl_map[] = {
> +	/* SCIFA1 */
> +	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "pfc-r8a7740",
> +				  "scifa1_data", "scifa1"),

Same request as for 1/6, please keep the entries alphabetically sorted.

>  	/* LCD0 */
>  	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-r8a7740",
>  				  "lcd0_data24_0", "lcd0"),
> @@ -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