From 791f2c9c26fb77a18c928cbc52dc54ff5647c0f4 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Sun, 6 May 2012 22:59:45 +0800
Subject: [PATCH] --- yaml --- r: 303327 b: refs/heads/master c:
 d98d033c15b77d51ed723ba10c49fa13233e59c1 h: refs/heads/master i:   303325:
 59f4151ab7ae2ce31dac9491eb4b77bf0e4b657e   303323:
 e84af3c14fa7e78916a2e471e1652a681f04b948   303319:
 6a5983248162941f631c77ffe8c46810483c99c9   303311:
 f30d73102164a2ea247bd6c7e72e0b4f371a319c   303295:
 1e7b2cf9a54ab0a7b692cee907ad614f9f861cb5 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/i2c/busses/i2c-mxs.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6798b45d7313..a82d8247d795 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39febc018bd26edb9f9f73c0f5ee661de37c7869
+refs/heads/master: d98d033c15b77d51ed723ba10c49fa13233e59c1
diff --git a/trunk/drivers/i2c/busses/i2c-mxs.c b/trunk/drivers/i2c/busses/i2c-mxs.c
index 3d471d56bf15..7c7711dc19d1 100644
--- a/trunk/drivers/i2c/busses/i2c-mxs.c
+++ b/trunk/drivers/i2c/busses/i2c-mxs.c
@@ -26,6 +26,7 @@
 #include <linux/platform_device.h>
 #include <linux/jiffies.h>
 #include <linux/io.h>
+#include <linux/pinctrl/consumer.h>
 
 #include <mach/common.h>
 
@@ -323,10 +324,15 @@ static int __devinit mxs_i2c_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct mxs_i2c_dev *i2c;
 	struct i2c_adapter *adap;
+	struct pinctrl *pinctrl;
 	struct resource *res;
 	resource_size_t res_size;
 	int err, irq;
 
+	pinctrl = devm_pinctrl_get_select_default(dev);
+	if (IS_ERR(pinctrl))
+		return PTR_ERR(pinctrl);
+
 	i2c = devm_kzalloc(dev, sizeof(struct mxs_i2c_dev), GFP_KERNEL);
 	if (!i2c)
 		return -ENOMEM;