ARM: shmobile: marzen: Register pinctrl mappings for HSPI

Replace the GPIO-based HSPI 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 4097366603b04b35c94583e19a03a4071a137399..8871af322b4e925dbd0244e47f060fdd45c6c40f 100644 (file)
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -329,6 +329,9 @@ void __init marzen_init_late(void)
 }
 
 static const struct pinctrl_map marzen_pinctrl_map[] = {
+       /* HSPI0 */
+       PIN_MAP_MUX_GROUP_DEFAULT("sh-hspi.0", "pfc-r8a7779",
+                                 "hspi0", "hspi0"),
        /* SCIF2 (CN18: DEBUG0) */
        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "pfc-r8a7779",
                                  "scif2_data_c", "scif2"),
@@ -361,12 +364,6 @@ static void __init marzen_init(void)
        gpio_request(GPIO_FN_EX_CS0, NULL); /* nCS */
        gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */
 
-       /* HSPI 0 */
-       gpio_request(GPIO_FN_HSPI_CLK0, NULL);
-       gpio_request(GPIO_FN_HSPI_CS0,  NULL);
-       gpio_request(GPIO_FN_HSPI_TX0,  NULL);
-       gpio_request(GPIO_FN_HSPI_RX0,  NULL);
-
        /* USB (CN21) */
        gpio_request(GPIO_FN_USB_OVC0, NULL);
        gpio_request(GPIO_FN_USB_OVC1, NULL);