Merge branch 'imx/pinctrl' into imx/dt

Conflicts:
	drivers/mmc/host/sdhci-esdhc-imx.c
	drivers/net/ethernet/freescale/fec.c
	drivers/spi/spi-imx.c
	drivers/tty/serial/imx.c

This resolves some simply but annoying conflicts.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

3 files changed, 24 insertions, 0 deletions

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 3d569cd68f5..062ef8c2b3c 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -52,6 +52,7 @@
 #include <linux/scatterlist.h>
 #include <linux/delay.h>
 #include <linux/types.h>
+#include <linux/pinctrl/consumer.h>
 
 #include <asm/io.h>
 #include <asm/sizes.h>
@@ -1916,6 +1917,7 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
 {
         struct uart_amba_port *uap;
         struct vendor_data *vendor = id->data;
+        struct pinctrl *pinctrl;
         void __iomem *base;
         int i, ret;
 
@@ -1940,6 +1942,12 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
                 goto free;
         }
 
+        pinctrl = devm_pinctrl_get_select_default(&dev->dev);
+        if (IS_ERR(pinctrl)) {
+                ret = PTR_ERR(pinctrl);
+                goto unmap;
+        }
+
         uap->clk = clk_get(&dev->dev, NULL);
         if (IS_ERR(uap->clk)) {
                 ret = PTR_ERR(uap->clk);
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 267ec6da5af..4ef747307ec 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -47,6 +47,7 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/pinctrl/consumer.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -1465,6 +1466,7 @@ static int serial_imx_probe(struct platform_device *pdev)
         void __iomem *base;
         int ret = 0;
         struct resource *res;
+        struct pinctrl *pinctrl;
 
         sport = kzalloc(sizeof(*sport), GFP_KERNEL);
         if (!sport)
@@ -1504,6 +1506,12 @@ static int serial_imx_probe(struct platform_device *pdev)
         sport->timer.function = imx_timeout;
         sport->timer.data     = (unsigned long)sport;
 
+        pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+        if (IS_ERR(pinctrl)) {
+                ret = PTR_ERR(pinctrl);
+                goto unmap;
+        }
+
         sport->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
         if (IS_ERR(sport->clk_ipg)) {
                 ret = PTR_ERR(sport->clk_ipg);
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 55fd362b987..7081600bede 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -32,6 +32,7 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/io.h>
+#include <linux/pinctrl/consumer.h>
 
 #include <asm/cacheflush.h>
 
@@ -678,6 +679,7 @@ static int __devinit mxs_auart_probe(struct platform_device *pdev)
         u32 version;
         int ret = 0;
         struct resource *r;
+        struct pinctrl *pinctrl;
 
         s = kzalloc(sizeof(struct mxs_auart_port), GFP_KERNEL);
         if (!s) {
@@ -685,6 +687,12 @@ static int __devinit mxs_auart_probe(struct platform_device *pdev)
                 goto out;
         }
 
+        pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+        if (IS_ERR(pinctrl)) {
+                ret = PTR_ERR(pinctrl);
+                goto out_free;
+        }
+
         s->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(s->clk)) {
                 ret = PTR_ERR(s->clk);