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 <diand...@chromium.org>
---
 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 65efb88..14a5683 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -1263,6 +1263,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");
@@ -1280,12 +1284,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;
 }
 
-- 
2.1.0.rc2.206.gedb03e5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to