MIPS: JZ4740: Qi LB60: Add pinctrl configuration for several drivers

We set the pin configuration for the jz4740-nand, jz4740-mmc,
jz4740-fb, jz4740-pwm and jz4740-uart drivers.

This will permit those drivers to be cleaned out of the custom GPIO code
that they currently use.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/mips/boot/dts/ingenic/qi_lb60.dts b/arch/mips/boot/dts/ingenic/qi_lb60.dts
index be1a7d3a3e1b5aa8819f702d6507c44116a1e1c7..b715ee2ac2ee9bb035793e05ab2d76d6dcbc313e 100644 (file)
--- a/arch/mips/boot/dts/ingenic/qi_lb60.dts
+++ b/arch/mips/boot/dts/ingenic/qi_lb60.dts
@@ -17,3 +17,16 @@
 &rtc_dev {
        system-power-controller;
 };
+
+&uart0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pins_uart0>;
+};
+
+&pinctrl {
+       pins_uart0: uart0 {
+               function = "uart0";
+               groups = "uart0-data";
+               bias-disable;
+       };
+};

diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c
index a5bd94b952635fb9ebb9b23e115625d4db8c6da1..6d7f97552200853259e6f2ba3ad06a2341423f4e 100644 (file)
--- a/arch/mips/jz4740/board-qi_lb60.c
+++ b/arch/mips/jz4740/board-qi_lb60.c
@@ -22,6 +22,8 @@
 #include <linux/input/matrix_keypad.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_gpio.h>
+#include <linux/pinctrl/machine.h>
+#include <linux/pinctrl/pinconf-generic.h>
 #include <linux/power_supply.h>
 #include <linux/power/jz4740-battery.h>
 #include <linux/power/gpio-charger.h>
@@ -159,7 +161,7 @@ static struct jz_nand_platform_data qi_lb60_nand_pdata = {
 static struct gpiod_lookup_table qi_lb60_nand_gpio_table = {
        .dev_id = "jz4740-nand.0",
        .table = {
-               GPIO_LOOKUP("Bank C", 30, "busy", 0),
+               GPIO_LOOKUP("GPIOC", 30, "busy", 0),
                { },
        },
 };
@@ -421,8 +423,8 @@ static struct platform_device qi_lb60_audio_device = {
 static struct gpiod_lookup_table qi_lb60_audio_gpio_table = {
        .dev_id = "qi-lb60-audio",
        .table = {
-               GPIO_LOOKUP("Bank B", 29, "snd", 0),
-               GPIO_LOOKUP("Bank D", 4, "amp", 0),
+               GPIO_LOOKUP("GPIOB", 29, "snd", 0),
+               GPIO_LOOKUP("GPIOD", 4, "amp", 0),
                { },
        },
 };
@@ -447,13 +449,36 @@ static struct platform_device *jz_platform_devices[] __initdata = {
        &qi_lb60_audio_device,
 };
 
-static void __init board_gpio_setup(void)
-{
-       /* We only need to enable/disable pullup here for pins used in generic
-        * drivers. Everything else is done by the drivers themselves. */
-       jz_gpio_disable_pullup(QI_LB60_GPIO_SD_VCC_EN_N);
-       jz_gpio_disable_pullup(QI_LB60_GPIO_SD_CD);
-}
+static unsigned long pin_cfg_bias_disable[] = {
+           PIN_CONFIG_BIAS_DISABLE,
+};
+
+static struct pinctrl_map pin_map[] __initdata = {
+       /* NAND pin configuration */
+       PIN_MAP_MUX_GROUP_DEFAULT("jz4740-nand",
+                       "10010000.jz4740-pinctrl", "nand", "nand-cs1"),
+
+       /* fbdev pin configuration */
+       PIN_MAP_MUX_GROUP("jz4740-fb", PINCTRL_STATE_DEFAULT,
+                       "10010000.jz4740-pinctrl", "lcd", "lcd-8bit"),
+       PIN_MAP_MUX_GROUP("jz4740-fb", PINCTRL_STATE_SLEEP,
+                       "10010000.jz4740-pinctrl", "lcd", "lcd-no-pins"),
+
+       /* MMC pin configuration */
+       PIN_MAP_MUX_GROUP_DEFAULT("jz4740-mmc.0",
+                       "10010000.jz4740-pinctrl", "mmc", "mmc-1bit"),
+       PIN_MAP_MUX_GROUP_DEFAULT("jz4740-mmc.0",
+                       "10010000.jz4740-pinctrl", "mmc", "mmc-4bit"),
+       PIN_MAP_CONFIGS_PIN_DEFAULT("jz4740-mmc.0",
+                       "10010000.jz4740-pinctrl", "PD0", pin_cfg_bias_disable),
+       PIN_MAP_CONFIGS_PIN_DEFAULT("jz4740-mmc.0",
+                       "10010000.jz4740-pinctrl", "PD2", pin_cfg_bias_disable),
+
+       /* PWM pin configuration */
+       PIN_MAP_MUX_GROUP_DEFAULT("jz4740-pwm",
+                       "10010000.jz4740-pinctrl", "pwm4", "pwm4"),
+};
+
 
 static int __init qi_lb60_init_platform_devices(void)
 {
@@ -469,6 +494,7 @@ static int __init qi_lb60_init_platform_devices(void)
                                ARRAY_SIZE(qi_lb60_spi_board_info));
 
        pwm_add_table(qi_lb60_pwm_lookup, ARRAY_SIZE(qi_lb60_pwm_lookup));
+       pinctrl_register_mappings(pin_map, ARRAY_SIZE(pin_map));
 
        return platform_add_devices(jz_platform_devices,
                                        ARRAY_SIZE(jz_platform_devices));
@@ -479,8 +505,6 @@ static int __init qi_lb60_board_setup(void)
 {
        printk(KERN_INFO "Qi Hardware JZ4740 QI LB60 setup\n");
 
-       board_gpio_setup();
-
        if (qi_lb60_init_platform_devices())
                panic("Failed to initialize platform devices");