---

yaml --- r: 347119 b: refs/heads/master c: 3db9b76 h: refs/heads/master i: 347117: 503fd52 347115: 4c083dd 347111: 0e78f82 347103: 595cf70 v: v3
git-mirror · Nov 28, 2012 · 30cd2ee · 30cd2ee
1 parent 3e0ad16
commit 30cd2ee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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) {