aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Figa <t.figa@samsung.com>2013-08-20 12:16:21 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-08-23 02:56:31 -0400
commit529301c19cbc315929e1b39ee71859061910b652 (patch)
treec806d108e0f0c4331e06d80906a09045efe98d5e
parent736658c5ebc93743687c6f627c9317b97d26c5be (diff)
pinctrl: samsung: Parse pin groups before calling pinctrl_register()
Calling pinctrl_register() means that the driver is fully initialized and might accept pinmux/pinconf requests, so pin groups must be parsed before. This patch fixes this problem by moving device tree parsing before call to pinctrl_register(). In addition, this fixes support for hogs on pin controllers handled by pinctrl-samsung driver. Signed-off-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/pinctrl-samsung.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/pinctrl/pinctrl-samsung.c b/drivers/pinctrl/pinctrl-samsung.c
index a7fa9e2d4751..439f2ef680df 100644
--- a/drivers/pinctrl/pinctrl-samsung.c
+++ b/drivers/pinctrl/pinctrl-samsung.c
@@ -767,6 +767,10 @@ static int samsung_pinctrl_register(struct platform_device *pdev,
767 } 767 }
768 } 768 }
769 769
770 ret = samsung_pinctrl_parse_dt(pdev, drvdata);
771 if (ret)
772 return ret;
773
770 drvdata->pctl_dev = pinctrl_register(ctrldesc, &pdev->dev, drvdata); 774 drvdata->pctl_dev = pinctrl_register(ctrldesc, &pdev->dev, drvdata);
771 if (!drvdata->pctl_dev) { 775 if (!drvdata->pctl_dev) {
772 dev_err(&pdev->dev, "could not register pinctrl driver\n"); 776 dev_err(&pdev->dev, "could not register pinctrl driver\n");
@@ -784,12 +788,6 @@ static int samsung_pinctrl_register(struct platform_device *pdev,
784 pinctrl_add_gpio_range(drvdata->pctl_dev, &pin_bank->grange); 788 pinctrl_add_gpio_range(drvdata->pctl_dev, &pin_bank->grange);
785 } 789 }
786 790
787 ret = samsung_pinctrl_parse_dt(pdev, drvdata);
788 if (ret) {
789 pinctrl_unregister(drvdata->pctl_dev);
790 return ret;
791 }
792
793 return 0; 791 return 0;
794} 792}
795 793