From 99da5a79137b629405952285525a6529dd34f5ab Mon Sep 17 00:00:00 2001
From: AnilKumar Ch <anilkumar@ti.com>
Date: Wed, 5 Sep 2012 16:42:41 +0530
Subject: [PATCH] --- yaml --- r: 328039 b: refs/heads/master c:
 006cd138fc8813220cb4b6450bd9b44f3401bb89 h: refs/heads/master i:   328037:
 2c24331ceb995ee5af3284b75445a2dddec3ede4   328035:
 b038b2ab98f7f7d9be3da81309ce8dbdc593eb79   328031:
 8a73c0fd0042a197b222b562e2b008689aceb847 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/can/c_can/c_can_platform.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 240fef0c9302..f50e6f75f84f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8212003260c600b9b55a79634fb29d0f7ec813d9
+refs/heads/master: 006cd138fc8813220cb4b6450bd9b44f3401bb89
diff --git a/trunk/drivers/net/can/c_can/c_can_platform.c b/trunk/drivers/net/can/c_can/c_can_platform.c
index 8a4e9d85a2af..ee1416132aba 100644
--- a/trunk/drivers/net/can/c_can/c_can_platform.c
+++ b/trunk/drivers/net/can/c_can/c_can_platform.c
@@ -32,6 +32,7 @@
 #include <linux/clk.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/pinctrl/consumer.h>
 
 #include <linux/can/dev.h>
 
@@ -97,6 +98,7 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev)
 	struct c_can_priv *priv;
 	const struct of_device_id *match;
 	const struct platform_device_id *id;
+	struct pinctrl *pinctrl;
 	struct resource *mem;
 	int irq;
 	struct clk *clk;
@@ -113,6 +115,11 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev)
 		id = platform_get_device_id(pdev);
 	}
 
+	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+	if (IS_ERR(pinctrl))
+		dev_warn(&pdev->dev,
+			"failed to configure pins from driver\n");
+
 	/* get the appropriate clk */
 	clk = clk_get(&pdev->dev, NULL);
 	if (IS_ERR(clk)) {