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, 6 insertions, 0 deletions

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 1efb08386c61..38c0690df5c8 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -35,6 +35,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/pinctrl/consumer.h>
 
 #define DRV_NAME                        "flexcan"
 
@@ -927,11 +928,16 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
         struct flexcan_priv *priv;
         struct resource *mem;
         struct clk *clk = NULL;
+        struct pinctrl *pinctrl;
         void __iomem *base;
         resource_size_t mem_size;
         int err, irq;
         u32 clock_freq = 0;
 
+        pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+        if (IS_ERR(pinctrl))
+                return PTR_ERR(pinctrl);
+
         if (pdev->dev.of_node) {
                 const u32 *clock_freq_p;