pinctrl: nomadik: assure GPIO chips are populated

If the pin controller probes before the GPIO driver it needs to
populate the GPIO driver state containers ahead of the actual
driver probe as the addresses are used by both halves of the
driver.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
index f63fcb3ed35288c880b832de582867b969e7a7e0..2213802435e00da9be96ae94c3cdad69756f7974 100644 (file)
--- a/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
+++ b/Documentation/devicetree/bindings/pinctrl/ste,nomadik.txt
@@ -3,7 +3,9 @@ ST Ericsson Nomadik pinmux controller
 Required properties:
 - compatible: "stericsson,db8500-pinctrl", "stericsson,db8540-pinctrl",
               "stericsson,stn8815-pinctrl"
-- reg: Should contain the register physical address and length of the PRCMU.
+- nomadik-gpio-chips: array of phandles to the corresponding GPIO chips
+              (these have the register ranges used by the pin controller).
+- prcm: phandle to the PRCMU managing the back end of this pin controller
 
 Please refer to pinctrl-bindings.txt in this directory for details of the
 common pinctrl bindings used by client devices, including the meaning of the
@@ -74,7 +76,8 @@ Example board file extract:
 
        pinctrl@80157000 {
                compatible = "stericsson,db8500-pinctrl";
-               reg = <0x80157000 0x2000>;
+               nomadik-gpio-chips = <&gpio0>, <&gpio1>, <&gpio2>, <&gpio3>;
+               prcm = <&prcmu>;
 
                pinctrl-names = "default";
 

diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
index 7b1160def28520d69bc46e51e3966eaa986abaea..143d1c06078c920a6fd8c6d7f19fac79c0330d51 100644 (file)
--- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c
+++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
@@ -2019,6 +2019,31 @@ static int nmk_pinctrl_probe(struct platform_device *pdev)
        if (version == PINCTRL_NMK_DB8540)
                nmk_pinctrl_db8540_init(&npct->soc);
 
+       /*
+        * Since we depend on the GPIO chips to provide clock and register base
+        * for the pin control operations, make sure that we have these
+        * populated before we continue. Follow the phandles to instantiate
+        * them. The GPIO portion of the actual hardware may be probed before
+        * or after this point: it shouldn't matter as the APIs are orthogonal.
+        */
+       for (i = 0; i < NMK_MAX_BANKS; i++) {
+               struct device_node *gpio_np;
+               struct nmk_gpio_chip *nmk_chip;
+
+               gpio_np = of_parse_phandle(np, "nomadik-gpio-chips", i);
+               if (gpio_np) {
+                       dev_info(&pdev->dev,
+                                "populate NMK GPIO %d \"%s\"\n",
+                                i, gpio_np->name);
+                       nmk_chip = nmk_gpio_populate_chip(gpio_np, pdev);
+                       if (IS_ERR(nmk_chip))
+                               dev_err(&pdev->dev,
+                                       "could not populate nmk chip struct "
+                                       "- continue anyway\n");
+                       of_node_put(gpio_np);
+               }
+       }
+
        prcm_np = of_parse_phandle(np, "prcm", 0);
        if (prcm_np)
                npct->prcm_base = of_iomap(prcm_np, 0);