gpio: tegra: Hide tegra_gpio_enable/disable()

Recent pinctrl discussions concluded that gpiolib APIs should in fact do
whatever is required to mux a GPIO onto pins, by calling pinctrl APIs if
required. This change implements this for the Tegra GPIO driver, and removes
calls to the Tegra-specific APIs from drivers and board files.

Cc: Chris Ball <cjb@laptop.org>
Cc: linux-mmc@vger.kernel.org
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Chris Ball <cjb@laptop.org> # for sdhci-tegra.c
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Olof Johansson <olof@lixom.net>

12 files changed, 27 insertions, 158 deletions

diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c
index 0952494f481a..65a5249b3718 100644
--- a/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@ -55,7 +55,6 @@ void ventana_pinmux_init(void);
 
 struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {
         OF_DEV_AUXDATA("nvidia,tegra20-pinmux", TEGRA_APB_MISC_BASE + 0x14, "tegra-pinmux", NULL),
-        OF_DEV_AUXDATA("nvidia,tegra20-gpio", TEGRA_GPIO_BASE, "tegra-gpio", NULL),
         OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC1_BASE, "sdhci-tegra.0", NULL),
         OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC2_BASE, "sdhci-tegra.1", NULL),
         OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC3_BASE, "sdhci-tegra.2", NULL),
diff --git a/arch/arm/mach-tegra/board-harmony-pinmux.c b/arch/arm/mach-tegra/board-harmony-pinmux.c
index 1af85bccc0f1..3ebe2c859a3b 100644
--- a/arch/arm/mach-tegra/board-harmony-pinmux.c
+++ b/arch/arm/mach-tegra/board-harmony-pinmux.c
@@ -15,13 +15,11 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/gpio.h>
 #include <linux/of.h>
 
 #include <mach/pinmux.h>
 #include <mach/pinmux-tegra20.h>
 
-#include "gpio-names.h"
 #include "board-harmony.h"
 #include "board-pinmux.h"
 
@@ -144,24 +142,9 @@ static struct tegra_pingroup_config harmony_pinmux[] = {
         {TEGRA_PINGROUP_XM2D,  TEGRA_MUX_NONE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
 };
 
-static struct tegra_gpio_table gpio_table[] = {
-        { .gpio = TEGRA_GPIO_SD2_CD,            .enable = true  },
-        { .gpio = TEGRA_GPIO_SD2_WP,            .enable = true  },
-        { .gpio = TEGRA_GPIO_SD2_POWER,         .enable = true  },
-        { .gpio = TEGRA_GPIO_SD4_CD,            .enable = true  },
-        { .gpio = TEGRA_GPIO_SD4_WP,            .enable = true  },
-        { .gpio = TEGRA_GPIO_SD4_POWER,         .enable = true  },
-        { .gpio = TEGRA_GPIO_CDC_IRQ,           .enable = true  },
-        { .gpio = TEGRA_GPIO_HP_DET,            .enable = true  },
-        { .gpio = TEGRA_GPIO_INT_MIC_EN,        .enable = true  },
-        { .gpio = TEGRA_GPIO_EXT_MIC_EN,        .enable = true  },
-};
-
 static struct tegra_board_pinmux_conf conf = {
         .pgs = harmony_pinmux,
         .pg_count = ARRAY_SIZE(harmony_pinmux),
-        .gpios = gpio_table,
-        .gpio_count = ARRAY_SIZE(gpio_table),
 };
 
 void harmony_pinmux_init(void)
diff --git a/arch/arm/mach-tegra/board-paz00-pinmux.c b/arch/arm/mach-tegra/board-paz00-pinmux.c
index c775572dcea4..f0ec46612f52 100644
--- a/arch/arm/mach-tegra/board-paz00-pinmux.c
+++ b/arch/arm/mach-tegra/board-paz00-pinmux.c
@@ -15,13 +15,11 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/gpio.h>
 #include <linux/of.h>
 
 #include <mach/pinmux.h>
 #include <mach/pinmux-tegra20.h>
 
-#include "gpio-names.h"
 #include "board-paz00.h"
 #include "board-pinmux.h"
 
@@ -144,21 +142,9 @@ static struct tegra_pingroup_config paz00_pinmux[] = {
         {TEGRA_PINGROUP_XM2D,  TEGRA_MUX_NONE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
 };
 
-static struct tegra_gpio_table gpio_table[] = {
-        { .gpio = TEGRA_GPIO_SD1_CD,    .enable = true },
-        { .gpio = TEGRA_GPIO_SD1_WP,    .enable = true },
-        { .gpio = TEGRA_GPIO_SD1_POWER, .enable = true },
-        { .gpio = TEGRA_ULPI_RST,       .enable = true },
-        { .gpio = TEGRA_WIFI_PWRN,      .enable = true },
-        { .gpio = TEGRA_WIFI_RST,       .enable = true },
-        { .gpio = TEGRA_WIFI_LED,       .enable = true },
-};
-
 static struct tegra_board_pinmux_conf conf = {
         .pgs = paz00_pinmux,
         .pg_count = ARRAY_SIZE(paz00_pinmux),
-        .gpios = gpio_table,
-        .gpio_count = ARRAY_SIZE(gpio_table),
 };
 
 void paz00_pinmux_init(void)
diff --git a/arch/arm/mach-tegra/board-pinmux.c b/arch/arm/mach-tegra/board-pinmux.c
index adc3efe979b3..3015b5a38936 100644
--- a/arch/arm/mach-tegra/board-pinmux.c
+++ b/arch/arm/mach-tegra/board-pinmux.c
@@ -18,7 +18,6 @@
 #include <linux/of.h>
 #include <linux/string.h>
 
-#include <mach/gpio-tegra.h>
 #include <mach/pinmux.h>
 
 #include "board-pinmux.h"
@@ -26,18 +25,6 @@
 
 struct tegra_board_pinmux_conf *confs[2];
 
-static void tegra_board_pinmux_setup_gpios(void)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(confs); i++) {
-                if (!confs[i])
-                        continue;
-
-                tegra_gpio_config(confs[i]->gpios, confs[i]->gpio_count);
-        }
-}
-
 static void tegra_board_pinmux_setup_pinmux(void)
 {
         int i;
@@ -57,29 +44,17 @@ static void tegra_board_pinmux_setup_pinmux(void)
 static int tegra_board_pinmux_bus_notify(struct notifier_block *nb,
                                          unsigned long event, void *vdev)
 {
-        static bool had_gpio;
-        static bool had_pinmux;
-
         struct device *dev = vdev;
-        const char *devname;
 
         if (event != BUS_NOTIFY_BOUND_DRIVER)
                 return NOTIFY_DONE;
 
-        devname = dev_name(dev);
+        if (strcmp(dev_name(dev), PINMUX_DEV))
+                return NOTIFY_DONE;
 
-        if (!had_gpio && !strcmp(devname, GPIO_DEV)) {
-                tegra_board_pinmux_setup_gpios();
-                had_gpio = true;
-        } else if (!had_pinmux && !strcmp(devname, PINMUX_DEV)) {
-                tegra_board_pinmux_setup_pinmux();
-                had_pinmux = true;
-        }
+        tegra_board_pinmux_setup_pinmux();
 
-        if (had_gpio && had_pinmux)
-                return NOTIFY_STOP_MASK;
-        else
-                return NOTIFY_DONE;
+        return NOTIFY_STOP_MASK;
 }
 
 static struct notifier_block nb = {
diff --git a/arch/arm/mach-tegra/board-pinmux.h b/arch/arm/mach-tegra/board-pinmux.h
index 4aac73546f54..e08214d84bd9 100644
--- a/arch/arm/mach-tegra/board-pinmux.h
+++ b/arch/arm/mach-tegra/board-pinmux.h
@@ -15,11 +15,9 @@
 #ifndef __MACH_TEGRA_BOARD_PINMUX_H
 #define __MACH_TEGRA_BOARD_PINMUX_H
 
-#define GPIO_DEV "tegra-gpio"
 #define PINMUX_DEV "tegra-pinmux"
 
 struct tegra_pingroup_config;
-struct tegra_gpio_table;
 
 struct tegra_board_pinmux_conf {
         struct tegra_pingroup_config *pgs;
@@ -27,9 +25,6 @@ struct tegra_board_pinmux_conf {
 
         struct tegra_drive_pingroup_config *drives;
         int drive_count;
-
-        struct tegra_gpio_table *gpios;
-        int gpio_count;
 };
 
 void tegra_board_pinmux_init(struct tegra_board_pinmux_conf *conf_a,
diff --git a/arch/arm/mach-tegra/board-seaboard-pinmux.c b/arch/arm/mach-tegra/board-seaboard-pinmux.c
index 55e7e43a14ad..3bf7e9705b6a 100644
--- a/arch/arm/mach-tegra/board-seaboard-pinmux.c
+++ b/arch/arm/mach-tegra/board-seaboard-pinmux.c
@@ -15,13 +15,11 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/gpio.h>
 #include <linux/of.h>
 
 #include <mach/pinmux.h>
 #include <mach/pinmux-tegra20.h>
 
-#include "gpio-names.h"
 #include "board-pinmux.h"
 #include "board-seaboard.h"
 
@@ -179,35 +177,9 @@ static struct tegra_pingroup_config ventana_pinmux[] = {
         {TEGRA_PINGROUP_SPIG, TEGRA_MUX_SPI2_ALT, TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
 };
 
-static struct tegra_gpio_table common_gpio_table[] = {
-        { .gpio = TEGRA_GPIO_SD2_CD,            .enable = true },
-        { .gpio = TEGRA_GPIO_SD2_WP,            .enable = true },
-        { .gpio = TEGRA_GPIO_SD2_POWER,         .enable = true },
-        { .gpio = TEGRA_GPIO_CDC_IRQ,           .enable = true },
-};
-
-static struct tegra_gpio_table seaboard_gpio_table[] = {
-        { .gpio = TEGRA_GPIO_LIDSWITCH,         .enable = true },
-        { .gpio = TEGRA_GPIO_POWERKEY,          .enable = true },
-        { .gpio = TEGRA_GPIO_HP_DET,            .enable = true },
-        { .gpio = TEGRA_GPIO_ISL29018_IRQ,      .enable = true },
-        { .gpio = TEGRA_GPIO_USB1,              .enable = true },
-};
-
-static struct tegra_gpio_table ventana_gpio_table[] = {
-        /* hp_det */
-        { .gpio = TEGRA_GPIO_PW2,               .enable = true },
-        /* int_mic_en */
-        { .gpio = TEGRA_GPIO_PX0,               .enable = true },
-        /* ext_mic_en */
-        { .gpio = TEGRA_GPIO_PX1,               .enable = true },
-};
-
 static struct tegra_board_pinmux_conf common_conf = {
         .pgs = common_pinmux,
         .pg_count = ARRAY_SIZE(common_pinmux),
-        .gpios = common_gpio_table,
-        .gpio_count = ARRAY_SIZE(common_gpio_table),
 };
 
 static struct tegra_board_pinmux_conf seaboard_conf = {
@@ -215,15 +187,11 @@ static struct tegra_board_pinmux_conf seaboard_conf = {
         .pg_count = ARRAY_SIZE(seaboard_pinmux),
         .drives = seaboard_drive_pinmux,
         .drive_count = ARRAY_SIZE(seaboard_drive_pinmux),
-        .gpios = seaboard_gpio_table,
-        .gpio_count = ARRAY_SIZE(seaboard_gpio_table),
 };
 
 static struct tegra_board_pinmux_conf ventana_conf = {
         .pgs = ventana_pinmux,
         .pg_count = ARRAY_SIZE(ventana_pinmux),
-        .gpios = ventana_gpio_table,
-        .gpio_count = ARRAY_SIZE(ventana_gpio_table),
 };
 
 void seaboard_pinmux_init(void)
diff --git a/arch/arm/mach-tegra/board-seaboard.c b/arch/arm/mach-tegra/board-seaboard.c
index 59987540df19..a0184fb44222 100644
--- a/arch/arm/mach-tegra/board-seaboard.c
+++ b/arch/arm/mach-tegra/board-seaboard.c
@@ -249,7 +249,6 @@ static void __init tegra_kaen_init(void)
         debug_uart_platform_data[0].irq = INT_UARTB;
 
         seaboard_audio_pdata.gpio_hp_mute = TEGRA_GPIO_KAEN_HP_MUTE;
-        tegra_gpio_enable(TEGRA_GPIO_KAEN_HP_MUTE);
 
         seaboard_common_init();
 
diff --git a/arch/arm/mach-tegra/board-trimslice-pinmux.c b/arch/arm/mach-tegra/board-trimslice-pinmux.c
index a21a2be57cb6..a1902d4e8e5d 100644
--- a/arch/arm/mach-tegra/board-trimslice-pinmux.c
+++ b/arch/arm/mach-tegra/board-trimslice-pinmux.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  *
  */
-#include <linux/gpio.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/of.h>
@@ -21,7 +20,6 @@
 #include <mach/pinmux.h>
 #include <mach/pinmux-tegra20.h>
 
-#include "gpio-names.h"
 #include "board-pinmux.h"
 #include "board-trimslice.h"
 
@@ -144,19 +142,9 @@ static struct tegra_pingroup_config trimslice_pinmux[] = {
         {TEGRA_PINGROUP_XM2D,  TEGRA_MUX_NONE,          TEGRA_PUPD_NORMAL,      TEGRA_TRI_NORMAL},
 };
 
-static struct tegra_gpio_table gpio_table[] = {
-        { .gpio = TRIMSLICE_GPIO_SD4_CD, .enable = true }, /* mmc4 cd */
-        { .gpio = TRIMSLICE_GPIO_SD4_WP, .enable = true }, /* mmc4 wp */
-
-        { .gpio = TRIMSLICE_GPIO_USB1_MODE, .enable = true }, /* USB1 mode */
-        { .gpio = TRIMSLICE_GPIO_USB2_RST,  .enable = true }, /* USB2 PHY rst */
-};
-
 static struct tegra_board_pinmux_conf conf = {
         .pgs = trimslice_pinmux,
         .pg_count = ARRAY_SIZE(trimslice_pinmux),
-        .gpios = gpio_table,
-        .gpio_count = ARRAY_SIZE(gpio_table),
 };
 
 void trimslice_pinmux_init(void)
diff --git a/arch/arm/mach-tegra/include/mach/gpio-tegra.h b/arch/arm/mach-tegra/include/mach/gpio-tegra.h
index 6140820555e1..a978b3cc3a8d 100644
--- a/arch/arm/mach-tegra/include/mach/gpio-tegra.h
+++ b/arch/arm/mach-tegra/include/mach/gpio-tegra.h
@@ -25,13 +25,4 @@
 
 #define TEGRA_NR_GPIOS          INT_GPIO_NR
 
-struct tegra_gpio_table {
-        int     gpio;   /* GPIO number */
-        bool    enable; /* Enable for GPIO at init? */
-};
-
-void tegra_gpio_config(struct tegra_gpio_table *table, int num);
-void tegra_gpio_enable(int gpio);
-void tegra_gpio_disable(int gpio);
-
 #endif
diff --git a/arch/arm/mach-tegra/usb_phy.c b/arch/arm/mach-tegra/usb_phy.c
index c5b2ac04e2a0..d71d2fed6721 100644
--- a/arch/arm/mach-tegra/usb_phy.c
+++ b/arch/arm/mach-tegra/usb_phy.c
@@ -711,7 +711,6 @@ struct tegra_usb_phy *tegra_usb_phy_open(int instance, void __iomem *regs,
                         err = -ENXIO;
                         goto err1;
                 }
-                tegra_gpio_enable(ulpi_config->reset_gpio);
                 gpio_request(ulpi_config->reset_gpio, "ulpi_phy_reset_b");
                 gpio_direction_output(ulpi_config->reset_gpio, 0);
                 phy->ulpi = otg_ulpi_create(&ulpi_viewport_access_ops, 0);
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 4383a7205349..dc5184d57892 100644
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -26,10 +26,10 @@
 #include <linux/platform_device.h>
 #include <linux/module.h>
 #include <linux/irqdomain.h>
+#include <linux/pinctrl/consumer.h>
 
 #include <asm/mach/irq.h>
 
-#include <mach/gpio-tegra.h>
 #include <mach/iomap.h>
 #include <mach/suspend.h>
 
@@ -108,18 +108,29 @@ static void tegra_gpio_mask_write(u32 reg, int gpio, int value)
         tegra_gpio_writel(val, reg);
 }
 
-void tegra_gpio_enable(int gpio)
+static void tegra_gpio_enable(int gpio)
 {
         tegra_gpio_mask_write(GPIO_MSK_CNF(gpio), gpio, 1);
 }
 EXPORT_SYMBOL_GPL(tegra_gpio_enable);
 
-void tegra_gpio_disable(int gpio)
+static void tegra_gpio_disable(int gpio)
 {
         tegra_gpio_mask_write(GPIO_MSK_CNF(gpio), gpio, 0);
 }
 EXPORT_SYMBOL_GPL(tegra_gpio_disable);
 
+int tegra_gpio_request(struct gpio_chip *chip, unsigned offset)
+{
+        return pinctrl_request_gpio(offset);
+}
+
+void tegra_gpio_free(struct gpio_chip *chip, unsigned offset)
+{
+        pinctrl_free_gpio(offset);
+        tegra_gpio_disable(offset);
+}
+
 static void tegra_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 {
         tegra_gpio_mask_write(GPIO_MSK_OUT(offset), offset, value);
@@ -133,6 +144,7 @@ static int tegra_gpio_get(struct gpio_chip *chip, unsigned offset)
 static int tegra_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
 {
         tegra_gpio_mask_write(GPIO_MSK_OE(offset), offset, 0);
+        tegra_gpio_enable(offset);
         return 0;
 }
 
@@ -141,6 +153,7 @@ static int tegra_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
 {
         tegra_gpio_set(chip, offset, value);
         tegra_gpio_mask_write(GPIO_MSK_OE(offset), offset, 1);
+        tegra_gpio_enable(offset);
         return 0;
 }
 
@@ -151,13 +164,14 @@ static int tegra_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
 
 static struct gpio_chip tegra_gpio_chip = {
         .label                  = "tegra-gpio",
+        .request                = tegra_gpio_request,
+        .free                   = tegra_gpio_free,
         .direction_input        = tegra_gpio_direction_input,
         .get                    = tegra_gpio_get,
         .direction_output       = tegra_gpio_direction_output,
         .set                    = tegra_gpio_set,
         .to_irq                 = tegra_gpio_to_irq,
         .base                   = 0,
-        .ngpio                  = TEGRA_NR_GPIOS,
 };
 
 static void tegra_gpio_irq_ack(struct irq_data *d)
@@ -493,20 +507,6 @@ static int __init tegra_gpio_init(void)
 }
 postcore_initcall(tegra_gpio_init);
 
-void tegra_gpio_config(struct tegra_gpio_table *table, int num)
-{
-        int i;
-
-        for (i = 0; i < num; i++) {
-                int gpio = table[i].gpio;
-
-                if (table[i].enable)
-                        tegra_gpio_enable(gpio);
-                else
-                        tegra_gpio_disable(gpio);
-        }
-}
-
 #ifdef  CONFIG_DEBUG_FS
 
 #include <linux/debugfs.h>
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index 53b26502f6e2..ff5a16991939 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -269,7 +269,6 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
                                 "failed to allocate power gpio\n");
                         goto err_power_req;
                 }
-                tegra_gpio_enable(plat->power_gpio);
                 gpio_direction_output(plat->power_gpio, 1);
         }
 
@@ -280,7 +279,6 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
                                 "failed to allocate cd gpio\n");
                         goto err_cd_req;
                 }
-                tegra_gpio_enable(plat->cd_gpio);
                 gpio_direction_input(plat->cd_gpio);
 
                 rc = request_irq(gpio_to_irq(plat->cd_gpio), carddetect_irq,
@@ -301,7 +299,6 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
                                 "failed to allocate wp gpio\n");
                         goto err_wp_req;
                 }
-                tegra_gpio_enable(plat->wp_gpio);
                 gpio_direction_input(plat->wp_gpio);
         }
 
@@ -329,23 +326,17 @@ err_add_host:
         clk_disable(pltfm_host->clk);
         clk_put(pltfm_host->clk);
 err_clk_get:
-        if (gpio_is_valid(plat->wp_gpio)) {
-                tegra_gpio_disable(plat->wp_gpio);
+        if (gpio_is_valid(plat->wp_gpio))
                 gpio_free(plat->wp_gpio);
-        }
 err_wp_req:
         if (gpio_is_valid(plat->cd_gpio))
                 free_irq(gpio_to_irq(plat->cd_gpio), host);
 err_cd_irq_req:
-        if (gpio_is_valid(plat->cd_gpio)) {
-                tegra_gpio_disable(plat->cd_gpio);
+        if (gpio_is_valid(plat->cd_gpio))
                 gpio_free(plat->cd_gpio);
-        }
 err_cd_req:
-        if (gpio_is_valid(plat->power_gpio)) {
-                tegra_gpio_disable(plat->power_gpio);
+        if (gpio_is_valid(plat->power_gpio))
                 gpio_free(plat->power_gpio);
-        }
 err_power_req:
 err_no_plat:
         sdhci_pltfm_free(pdev);
@@ -362,21 +353,16 @@ static int __devexit sdhci_tegra_remove(struct platform_device *pdev)
 
         sdhci_remove_host(host, dead);
 
-        if (gpio_is_valid(plat->wp_gpio)) {
-                tegra_gpio_disable(plat->wp_gpio);
+        if (gpio_is_valid(plat->wp_gpio))
                 gpio_free(plat->wp_gpio);
-        }
 
         if (gpio_is_valid(plat->cd_gpio)) {
                 free_irq(gpio_to_irq(plat->cd_gpio), host);
-                tegra_gpio_disable(plat->cd_gpio);
                 gpio_free(plat->cd_gpio);
         }
 
-        if (gpio_is_valid(plat->power_gpio)) {
-                tegra_gpio_disable(plat->power_gpio);
+        if (gpio_is_valid(plat->power_gpio))
                 gpio_free(plat->power_gpio);
-        }
 
         clk_disable(pltfm_host->clk);
         clk_put(pltfm_host->clk);