Commit 529301c1 authored Aug 20, 2013 by Tomasz Figa Committed by Linus Walleij Aug 23, 2013

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>

parent 736658c5

drivers/pinctrl/pinctrl-samsung.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -767,6 +767,10 @@ static int samsung_pinctrl_register(struct platform_device *pdev,
		}
		}

		ret = samsung_pinctrl_parse_dt(pdev, drvdata);
		if (ret)
		return ret;

		drvdata->pctl_dev = pinctrl_register(ctrldesc, &pdev->dev, drvdata);
		if (!drvdata->pctl_dev) {
		dev_err(&pdev->dev, "could not register pinctrl driver\n");
		@@ -784,12 +788,6 @@ static int samsung_pinctrl_register(struct platform_device *pdev,
		pinctrl_add_gpio_range(drvdata->pctl_dev, &pin_bank->grange);
		}

		ret = samsung_pinctrl_parse_dt(pdev, drvdata);
		if (ret) {
		pinctrl_unregister(drvdata->pctl_dev);
		return ret;
		}

		return 0;
		}