From 3d02f408623e6c8c308f0f36d6b97b4919f009a8 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Sun, 6 May 2012 20:28:12 +0800
Subject: [PATCH] --- yaml --- r: 303322 b: refs/heads/master c:
 dffa27e7a8626ed2d64f027b0f844fe6fe438c11 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/spi/spi-imx.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b0c14df52084..f6b84af048f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15afbc68780f8c06c5b5590adcbf7534ee1920b3
+refs/heads/master: dffa27e7a8626ed2d64f027b0f844fe6fe438c11
diff --git a/trunk/drivers/spi/spi-imx.c b/trunk/drivers/spi/spi-imx.c
index 570f22053be8..69c9a6601f45 100644
--- a/trunk/drivers/spi/spi-imx.c
+++ b/trunk/drivers/spi/spi-imx.c
@@ -37,6 +37,7 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
+#include <linux/pinctrl/consumer.h>
 
 #include <mach/spi.h>
 
@@ -758,6 +759,7 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
 	struct spi_master *master;
 	struct spi_imx_data *spi_imx;
 	struct resource *res;
+	struct pinctrl *pinctrl;
 	int i, ret, num_cs;
 
 	if (!np && !mxc_platform_info) {
@@ -845,6 +847,12 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
 		goto out_iounmap;
 	}
 
+	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+	if (IS_ERR(pinctrl)) {
+		ret = PTR_ERR(pinctrl);
+		goto out_free_irq;
+	}
+
 	spi_imx->clk = clk_get(&pdev->dev, NULL);
 	if (IS_ERR(spi_imx->clk)) {
 		dev_err(&pdev->dev, "unable to get clock\n");