ARM: shmobile: kzm9g: Register pinctrl mappings for SCIF
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Thu, 3 Jan 2013 11:54:28 +0000 (12:54 +0100)
committerLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Fri, 15 Mar 2013 12:34:11 +0000 (13:34 +0100)
Replace the GPIO-based SCIF pinmux configuration by pinctrl mappings.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
arch/arm/mach-shmobile/board-kzm9g.c

index 7cef0058bfded8ff9edb9b5ed57debbedbe87872..3d2cdc45c4d0ff9b96bfa9319ec681e7075d853a 100644 (file)
@@ -606,6 +606,11 @@ static const struct pinctrl_map kzm_pinctrl_map[] = {
                                  "lcd_data24", "lcd"),
        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-sh73a0",
                                  "lcd_sync", "lcd"),
+       /* SCIFA4 */
+       PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
+                                 "scifa4_data", "scifa4"),
+       PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
+                                 "scifa4_ctrl", "scifa4"),
 };
 
 /*
@@ -673,12 +678,6 @@ static void __init kzm_init(void)
 
        sh73a0_pinmux_init();
 
-       /* enable SCIFA4 */
-       gpio_request(GPIO_FN_SCIFA4_TXD, NULL);
-       gpio_request(GPIO_FN_SCIFA4_RXD, NULL);
-       gpio_request(GPIO_FN_SCIFA4_RTS_, NULL);
-       gpio_request(GPIO_FN_SCIFA4_CTS_, NULL);
-
        /* CS4 for SMSC/USB */
        gpio_request(GPIO_FN_CS4_, NULL); /* CS4 */