ARM: shmobile: marzen: Register pinctrl mappings for SCIF

Replace the GPIO-based SCIF pinmux configuration by pinctrl mappings.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index f00677fcc78a0c8e4a8de33e8839b7c8b9df3c2c..4097366603b04b35c94583e19a03a4071a137399 100644 (file)
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -329,6 +329,12 @@ void __init marzen_init_late(void)
 }
 
 static const struct pinctrl_map marzen_pinctrl_map[] = {
+       /* SCIF2 (CN18: DEBUG0) */
+       PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "pfc-r8a7779",
+                                 "scif2_data_c", "scif2"),
+       /* SCIF4 (CN19: DEBUG1) */
+       PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-r8a7779",
+                                 "scif4_data", "scif4"),
        /* SDHI0 */
        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
                                  "sdhi0_data4", "sdhi0"),
@@ -351,14 +357,6 @@ static void __init marzen_init(void)
                                  ARRAY_SIZE(marzen_pinctrl_map));
        r8a7779_pinmux_init();
 
-       /* SCIF2 (CN18: DEBUG0) */
-       gpio_request(GPIO_FN_TX2_C, NULL);
-       gpio_request(GPIO_FN_RX2_C, NULL);
-
-       /* SCIF4 (CN19: DEBUG1) */
-       gpio_request(GPIO_FN_TX4, NULL);
-       gpio_request(GPIO_FN_RX4, NULL);
-
        /* LAN89218 */
        gpio_request(GPIO_FN_EX_CS0, NULL); /* nCS */
        gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */