| Message ID | 1413913655-22351-3-git-send-email-dianders@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Dienstag, 21. Oktober 2014, 10:47:34 schrieb Doug Anderson: > Just like in (529301c pinctrl: samsung: Parse pin groups before > calling pinctrl_register()), Rockchip also needs to parse pin groups > earlier to make hogs work. > > Signed-off-by: Doug Anderson <dianders@chromium.org> > Tested-by: Chris Zhong <zyw@rock-chips.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> > --- > Changes in v2: None > > drivers/pinctrl/pinctrl-rockchip.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-rockchip.c > b/drivers/pinctrl/pinctrl-rockchip.c index 8a3c582..6c14f6c 100644 > --- a/drivers/pinctrl/pinctrl-rockchip.c > +++ b/drivers/pinctrl/pinctrl-rockchip.c > @@ -1262,6 +1262,10 @@ static int rockchip_pinctrl_register(struct > platform_device *pdev, } > } > > + ret = rockchip_pinctrl_parse_dt(pdev, info); > + if (ret) > + return ret; > + > info->pctl_dev = pinctrl_register(ctrldesc, &pdev->dev, info); > if (!info->pctl_dev) { > dev_err(&pdev->dev, "could not register pinctrl driver\n"); > @@ -1279,12 +1283,6 @@ static int rockchip_pinctrl_register(struct > platform_device *pdev, pinctrl_add_gpio_range(info->pctl_dev, > &pin_bank->grange); > } > > - ret = rockchip_pinctrl_parse_dt(pdev, info); > - if (ret) { > - pinctrl_unregister(info->pctl_dev); > - return ret; > - } > - > return 0; > }
On Thu, Oct 23, 2014 at 6:26 PM, Heiko Stübner <heiko@sntech.de> wrote: > Am Dienstag, 21. Oktober 2014, 10:47:34 schrieb Doug Anderson: >> Just like in (529301c pinctrl: samsung: Parse pin groups before >> calling pinctrl_register()), Rockchip also needs to parse pin groups >> earlier to make hogs work. >> >> Signed-off-by: Doug Anderson <dianders@chromium.org> >> Tested-by: Chris Zhong <zyw@rock-chips.com> > > Reviewed-by: Heiko Stuebner <heiko@sntech.de> Heiko, can you collect this for a pull request? Yours, Linus Walleij
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c index 8a3c582..6c14f6c 100644 --- a/drivers/pinctrl/pinctrl-rockchip.c +++ b/drivers/pinctrl/pinctrl-rockchip.c @@ -1262,6 +1262,10 @@ static int rockchip_pinctrl_register(struct platform_device *pdev, } } + ret = rockchip_pinctrl_parse_dt(pdev, info); + if (ret) + return ret; + info->pctl_dev = pinctrl_register(ctrldesc, &pdev->dev, info); if (!info->pctl_dev) { dev_err(&pdev->dev, "could not register pinctrl driver\n"); @@ -1279,12 +1283,6 @@ static int rockchip_pinctrl_register(struct platform_device *pdev, pinctrl_add_gpio_range(info->pctl_dev, &pin_bank->grange); } - ret = rockchip_pinctrl_parse_dt(pdev, info); - if (ret) { - pinctrl_unregister(info->pctl_dev); - return ret; - } - return 0; }