Merge branch 'imx/pinctrl' into imx/clock

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 dependencies between the pinctrl and clock changes
in imx.

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

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index b2494637cb60..4d3280ae56e8 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -48,6 +48,7 @@
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <linux/of_net.h>
+#include <linux/pinctrl/consumer.h>
 
 #include <asm/cacheflush.h>
 
@@ -1543,6 +1544,7 @@ fec_probe(struct platform_device *pdev)
         struct resource *r;
         const struct of_device_id *of_id;
         static int dev_id;
+        struct pinctrl *pinctrl;
 
         of_id = of_match_device(fec_dt_ids, &pdev->dev);
         if (of_id)
@@ -1610,6 +1612,12 @@ fec_probe(struct platform_device *pdev)
                 }
         }
 
+        pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+        if (IS_ERR(pinctrl)) {
+                ret = PTR_ERR(pinctrl);
+                goto failed_pin;
+        }
+
         fep->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
         if (IS_ERR(fep->clk_ipg)) {
                 ret = PTR_ERR(fep->clk_ipg);
@@ -1648,6 +1656,7 @@ failed_mii_init:
 failed_init:
         clk_disable_unprepare(fep->clk_ahb);
         clk_disable_unprepare(fep->clk_ipg);
+failed_pin:
 failed_clk:
         for (i = 0; i < FEC_IRQ_NUM; i++) {
                 irq = platform_get_irq(pdev, i);