Commit 0fb7dcb1 authored by Doug Anderson's avatar Doug Anderson Committed by Heiko Stuebner

pinctrl: rockchip: Parse pin groups before calling pinctrl_register()

Just like in (529301c1 pinctrl: samsung: Parse pin groups before
calling pinctrl_register()), Rockchip also needs to parse pin groups
earlier to make hogs work.
Signed-off-by: default avatarDoug Anderson <dianders@chromium.org>
Tested-by: default avatarChris Zhong <zyw@rock-chips.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent e5c2c9db
...@@ -1262,6 +1262,10 @@ static int rockchip_pinctrl_register(struct platform_device *pdev, ...@@ -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); info->pctl_dev = pinctrl_register(ctrldesc, &pdev->dev, info);
if (!info->pctl_dev) { if (!info->pctl_dev) {
dev_err(&pdev->dev, "could not register pinctrl driver\n"); dev_err(&pdev->dev, "could not register pinctrl driver\n");
...@@ -1279,12 +1283,6 @@ static int rockchip_pinctrl_register(struct platform_device *pdev, ...@@ -1279,12 +1283,6 @@ static int rockchip_pinctrl_register(struct platform_device *pdev,
pinctrl_add_gpio_range(info->pctl_dev, &pin_bank->grange); 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; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment