ARM: shmobile: bonito: Register pinctrl mapping for BSC

Replace the GPIO-based BSC pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/arch/arm/mach-shmobile/board-bonito.c b/arch/arm/mach-shmobile/board-bonito.c
index 5076f4d5067b14552c82b3c6268ec8e5872aa4ee..2781c7fd591a8347b57dd63c207804811895d6df 100644 (file)
--- a/arch/arm/mach-shmobile/board-bonito.c
+++ b/arch/arm/mach-shmobile/board-bonito.c
@@ -376,6 +376,12 @@ static void __init bonito_map_io(void)
  */
 static const struct pinctrl_map fpga_pinctrl_map[] = {
        /* FPGA */
+       PIN_MAP_MUX_GROUP_DEFAULT("pfc-r8a7740", "pfc-r8a7740",
+                                 "bsc_cs5a_0", "bsc"),
+       PIN_MAP_MUX_GROUP_DEFAULT("pfc-r8a7740", "pfc-r8a7740",
+                                 "bsc_cs5b", "bsc"),
+       PIN_MAP_MUX_GROUP_DEFAULT("pfc-r8a7740", "pfc-r8a7740",
+                                 "bsc_cs6a", "bsc"),
        PIN_MAP_MUX_GROUP_DEFAULT("pfc-r8a7740", "pfc-r8a7740",
                                  "intc_irq10", "intc"),
 };
@@ -419,13 +425,6 @@ static void __init bonito_init(void)
                u16 bsw3;
                u16 bsw4;
 
-               /*
-                * FPGA
-                */
-               gpio_request(GPIO_FN_CS5B,              NULL);
-               gpio_request(GPIO_FN_CS6A,              NULL);
-               gpio_request(GPIO_FN_CS5A_PORT105,      NULL);
-
                val = bonito_fpga_read(BVERR);
                pr_info("bonito version: cpu %02x, base %02x\n",
                        ((val >> 8) & 0xFF),