From 30cd2eed24e840642fdb85e691c25f0f17a5551e Mon Sep 17 00:00:00 2001
From: "Philip, Avinash" <avinashphilip@ti.com>
Date: Tue, 27 Nov 2012 14:18:10 +0530
Subject: [PATCH] --- yaml --- r: 347119 b: refs/heads/master c:
 3db9b76d7b6aa6eee1f9be83cf807e531e74bf4f h: refs/heads/master i:   347117:
 503fd526f6f2bf14e038285f63f5d4207522e449   347115:
 4c083dd48e6bd68fdc2f3ca4b1f6a50830a6546f   347111:
 0e78f8242a5aa3f22e3bdce29d20921aff700537   347103:
 595cf7060155a7e564e380c7d6fffb6d3565110f v: v3

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

diff --git a/[refs] b/[refs]
index 22a10f5f2c4d..6179bc711839 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 333b08ee8c6e120d67118e4eb71c45f5c369c8a4
+refs/heads/master: 3db9b76d7b6aa6eee1f9be83cf807e531e74bf4f
diff --git a/trunk/drivers/pwm/pwm-tiecap.c b/trunk/drivers/pwm/pwm-tiecap.c
index 0f541c5cbe98..b4f9d4756d58 100644
--- a/trunk/drivers/pwm/pwm-tiecap.c
+++ b/trunk/drivers/pwm/pwm-tiecap.c
@@ -26,6 +26,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/pwm.h>
 #include <linux/of_device.h>
+#include <linux/pinctrl/consumer.h>
 
 #include "pwm-tipwmss.h"
 
@@ -200,6 +201,11 @@ static int __devinit ecap_pwm_probe(struct platform_device *pdev)
 	struct clk *clk;
 	struct ecap_pwm_chip *pc;
 	u16 status;
+	struct pinctrl *pinctrl;
+
+	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+	if (IS_ERR(pinctrl))
+		dev_warn(&pdev->dev, "unable to select pin group\n");
 
 	pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL);
 	if (!pc) {