Merge tag 'renesas-pinctrl-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC pinctrl changes for Renesas from Olof Johansson:
 "This is yet another driver change, which is split out just because of
  its size.  As already in 3.9, a lot of changes are going on here, as
  the shmobile platform gets converted from its own pin control API to
  the generic drivers/pinctrl subsystem.

  Based on agreements with Paul Mundt, we are merging the sh-arch-side
  changes here as well"

* tag 'renesas-pinctrl-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (142 commits)
  ARM: shmobile: r8a7779: Remove INTC function GPIOs
  ARM: shmobile: r8a7779: Remove LBSC function GPIOs
  ARM: shmobile: r8a7779: Remove USB function GPIOs
  ARM: shmobile: r8a7779: Remove HSPI function GPIOs
  ARM: shmobile: r8a7779: Remove SCIF function GPIOs
  ARM: shmobile: r8a7779: Remove SDHI and MMCIF function GPIOs
  ARM: shmobile: r8a7779: Remove DU function GPIOs
  ARM: shmobile: r8a7779: Remove DU1_DOTCLKOUT1 GPIO
  ARM: shmobile: r8a7740: Remove SDHI and MMCIF function GPIOs
  ARM: shmobile: r8a7740: Remove LCD0 and LCD1 function GPIOs
  ARM: shmobile: sh73a0: Remove IrDA function GPIOs
  ARM: shmobile: sh73a0: Remove USB function GPIOs
  ARM: shmobile: sh73a0: Remove BSC function GPIOs
  ARM: shmobile: sh73a0: Remove KEYSC function GPIOs
  ARM: shmobile: sh73a0: Remove pull-up function GPIOS
  ARM: shmobile: sh73a0: Remove FSI function GPIOs
  ARM: shmobile: sh73a0: Remove I2C function GPIOs
  ARM: shmobile: sh73a0: Remove SCIFA and SCIFB function GPIOs
  ARM: shmobile: sh73a0: Remove LCDC and LCDC2 function GPIOs
  ARM: shmobile: sh7372: Remove SDHI and MMCIF function GPIOs
  ...

1 files changed, 69 insertions, 83 deletions

diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 95fe396f9604..42e51645ee54 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -30,6 +30,8 @@
 #include <linux/mmc/sh_mmcif.h>
 #include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mfd/tmio.h>
+#include <linux/pinctrl/machine.h>
+#include <linux/pinctrl/pinconf-generic.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
@@ -437,7 +439,7 @@ static struct sh_mobile_sdhi_info sdhi2_info = {
                           TMIO_MMC_WRPROTECT_DISABLE,
         .tmio_caps      = MMC_CAP_SD_HIGHSPEED,
         .tmio_ocr_mask  = MMC_VDD_27_28 | MMC_VDD_28_29,
-        .cd_gpio        = GPIO_PORT13,
+        .cd_gpio        = 13,
 };
 
 static struct resource sdhi2_resources[] = {
@@ -603,6 +605,64 @@ static struct platform_device *kzm_devices[] __initdata = {
         &fsi_ak4648_device,
 };
 
+static unsigned long pin_pullup_conf[] = {
+        PIN_CONF_PACKED(PIN_CONFIG_BIAS_PULL_UP, 0),
+};
+
+static const struct pinctrl_map kzm_pinctrl_map[] = {
+        /* FSIA (AK4648) */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",
+                                  "fsia_mclk_in", "fsia"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",
+                                  "fsia_sclk_in", "fsia"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",
+                                  "fsia_data_in", "fsia"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",
+                                  "fsia_data_out", "fsia"),
+        /* I2C3 */
+        PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.3", "pfc-sh73a0",
+                                  "i2c3_1", "i2c3"),
+        /* LCD */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-sh73a0",
+                                  "lcd_data24", "lcd"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_lcdc_fb.0", "pfc-sh73a0",
+                                  "lcd_sync", "lcd"),
+        /* MMCIF */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
+                                  "mmc0_data8_0", "mmc0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
+                                  "mmc0_ctrl_0", "mmc0"),
+        PIN_MAP_CONFIGS_PIN_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
+                                    "PORT279", pin_pullup_conf),
+        PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
+                                      "mmc0_data8_0", pin_pullup_conf),
+        /* 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"),
+        /* SDHI0 */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
+                                  "sdhi0_data4", "sdhi0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
+                                  "sdhi0_ctrl", "sdhi0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
+                                  "sdhi0_cd", "sdhi0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
+                                  "sdhi0_wp", "sdhi0"),
+        /* SDHI2 */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-sh73a0",
+                                  "sdhi2_data4", "sdhi2"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-sh73a0",
+                                  "sdhi2_ctrl", "sdhi2"),
+        /* SMSC */
+        PIN_MAP_MUX_GROUP_DEFAULT("smsc911x.0", "pfc-sh73a0",
+                                  "bsc_cs4", "bsc"),
+        /* USB */
+        PIN_MAP_MUX_GROUP_DEFAULT("renesas_usbhs", "pfc-sh73a0",
+                                  "usb_vbus", "usb"),
+};
+
 /*
  * FIXME
  *
@@ -664,100 +724,26 @@ static void __init kzm_init(void)
                                      ARRAY_SIZE(fixed2v8_power_consumers), 2800000);
         regulator_register_fixed(2, dummy_supplies, ARRAY_SIZE(dummy_supplies));
 
-        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);
+        pinctrl_register_mappings(kzm_pinctrl_map, ARRAY_SIZE(kzm_pinctrl_map));
 
-        /* CS4 for SMSC/USB */
-        gpio_request(GPIO_FN_CS4_, NULL); /* CS4 */
+        sh73a0_pinmux_init();
 
         /* SMSC */
-        gpio_request_one(GPIO_PORT224, GPIOF_IN, NULL); /* IRQ3 */
+        gpio_request_one(224, GPIOF_IN, NULL); /* IRQ3 */
 
         /* LCDC */
-        gpio_request(GPIO_FN_LCDD23,    NULL);
-        gpio_request(GPIO_FN_LCDD22,    NULL);
-        gpio_request(GPIO_FN_LCDD21,    NULL);
-        gpio_request(GPIO_FN_LCDD20,    NULL);
-        gpio_request(GPIO_FN_LCDD19,    NULL);
-        gpio_request(GPIO_FN_LCDD18,    NULL);
-        gpio_request(GPIO_FN_LCDD17,    NULL);
-        gpio_request(GPIO_FN_LCDD16,    NULL);
-        gpio_request(GPIO_FN_LCDD15,    NULL);
-        gpio_request(GPIO_FN_LCDD14,    NULL);
-        gpio_request(GPIO_FN_LCDD13,    NULL);
-        gpio_request(GPIO_FN_LCDD12,    NULL);
-        gpio_request(GPIO_FN_LCDD11,    NULL);
-        gpio_request(GPIO_FN_LCDD10,    NULL);
-        gpio_request(GPIO_FN_LCDD9,     NULL);
-        gpio_request(GPIO_FN_LCDD8,     NULL);
-        gpio_request(GPIO_FN_LCDD7,     NULL);
-        gpio_request(GPIO_FN_LCDD6,     NULL);
-        gpio_request(GPIO_FN_LCDD5,     NULL);
-        gpio_request(GPIO_FN_LCDD4,     NULL);
-        gpio_request(GPIO_FN_LCDD3,     NULL);
-        gpio_request(GPIO_FN_LCDD2,     NULL);
-        gpio_request(GPIO_FN_LCDD1,     NULL);
-        gpio_request(GPIO_FN_LCDD0,     NULL);
-        gpio_request(GPIO_FN_LCDDISP,   NULL);
-        gpio_request(GPIO_FN_LCDDCK,    NULL);
-
-        gpio_request_one(GPIO_PORT222, GPIOF_OUT_INIT_HIGH, NULL); /* LCDCDON */
-        gpio_request_one(GPIO_PORT226, GPIOF_OUT_INIT_HIGH, NULL); /* SC */
+        gpio_request_one(222, GPIOF_OUT_INIT_HIGH, NULL); /* LCDCDON */
+        gpio_request_one(226, GPIOF_OUT_INIT_HIGH, NULL); /* SC */
 
         /* Touchscreen */
-        gpio_request_one(GPIO_PORT223, GPIOF_IN, NULL); /* IRQ8 */
-
-        /* enable MMCIF */
-        gpio_request(GPIO_FN_MMCCLK0,           NULL);
-        gpio_request(GPIO_FN_MMCCMD0_PU,        NULL);
-        gpio_request(GPIO_FN_MMCD0_0_PU,        NULL);
-        gpio_request(GPIO_FN_MMCD0_1_PU,        NULL);
-        gpio_request(GPIO_FN_MMCD0_2_PU,        NULL);
-        gpio_request(GPIO_FN_MMCD0_3_PU,        NULL);
-        gpio_request(GPIO_FN_MMCD0_4_PU,        NULL);
-        gpio_request(GPIO_FN_MMCD0_5_PU,        NULL);
-        gpio_request(GPIO_FN_MMCD0_6_PU,        NULL);
-        gpio_request(GPIO_FN_MMCD0_7_PU,        NULL);
+        gpio_request_one(223, GPIOF_IN, NULL); /* IRQ8 */
 
         /* enable SD */
-        gpio_request(GPIO_FN_SDHIWP0,           NULL);
-        gpio_request(GPIO_FN_SDHICD0,           NULL);
-        gpio_request(GPIO_FN_SDHICMD0,          NULL);
-        gpio_request(GPIO_FN_SDHICLK0,          NULL);
-        gpio_request(GPIO_FN_SDHID0_3,          NULL);
-        gpio_request(GPIO_FN_SDHID0_2,          NULL);
-        gpio_request(GPIO_FN_SDHID0_1,          NULL);
-        gpio_request(GPIO_FN_SDHID0_0,          NULL);
         gpio_request(GPIO_FN_SDHI0_VCCQ_MC0_ON, NULL);
-        gpio_request_one(GPIO_PORT15, GPIOF_OUT_INIT_HIGH, NULL); /* power */
+        gpio_request_one(15, GPIOF_OUT_INIT_HIGH, NULL); /* power */
 
         /* enable Micro SD */
-        gpio_request(GPIO_FN_SDHID2_0,          NULL);
-        gpio_request(GPIO_FN_SDHID2_1,          NULL);
-        gpio_request(GPIO_FN_SDHID2_2,          NULL);
-        gpio_request(GPIO_FN_SDHID2_3,          NULL);
-        gpio_request(GPIO_FN_SDHICMD2,          NULL);
-        gpio_request(GPIO_FN_SDHICLK2,          NULL);
-        gpio_request_one(GPIO_PORT14, GPIOF_OUT_INIT_HIGH, NULL); /* power */
-
-        /* I2C 3 */
-        gpio_request(GPIO_FN_PORT27_I2C_SCL3, NULL);
-        gpio_request(GPIO_FN_PORT28_I2C_SDA3, NULL);
-
-        /* enable FSI2 port A (ak4648) */
-        gpio_request(GPIO_FN_FSIACK,    NULL);
-        gpio_request(GPIO_FN_FSIAILR,   NULL);
-        gpio_request(GPIO_FN_FSIAIBT,   NULL);
-        gpio_request(GPIO_FN_FSIAISLD,  NULL);
-        gpio_request(GPIO_FN_FSIAOSLD,  NULL);
-
-        /* enable USB */
-        gpio_request(GPIO_FN_VBUS_0,    NULL);
+        gpio_request_one(14, GPIOF_OUT_INIT_HIGH, NULL); /* power */
 
 #ifdef CONFIG_CACHE_L2X0
         /* Early BRESP enable, Shared attribute override enable, 64K*8way */