pinctrl: imx1-core populate subdevices

Support gpio devicetree subnodes to allow a more detailed DT hardware
description.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

2 files changed, 29 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt
index 353eca0efbf8..d1706ea82572 100644
--- a/Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt
@@ -52,12 +52,25 @@ Required properties for pin configuration node:
   CONFIG can be 0 or 1, meaning Pullup disable/enable.
 
 
+The iomux controller has gpio child nodes which are embedded in the iomux
+control registers. They have to be defined as child nodes of the iomux device
+node. If gpio subnodes are defined "#address-cells", "#size-cells" and "ranges"
+properties for the iomux device node are required.
 
 Example:
 
 iomuxc: iomuxc@10015000 {
         compatible = "fsl,imx27-iomuxc";
         reg = <0x10015000 0x600>;
+        #address-cells = <1>;
+        #size-cells = <1>;
+        ranges;
+
+        gpio1: gpio@10015000 {
+                ...
+        };
+
+        ...
 
         uart {
                 pinctrl_uart1: uart-1 {
@@ -83,6 +96,15 @@ The above example using macros:
 iomuxc: iomuxc@10015000 {
         compatible = "fsl,imx27-iomuxc";
         reg = <0x10015000 0x600>;
+        #address-cells = <1>;
+        #size-cells = <1>;
+        ranges;
+
+        gpio1: gpio@10015000 {
+                ...
+        };
+
+        ...
 
         uart {
                 pinctrl_uart1: uart-1 {
diff --git a/drivers/pinctrl/pinctrl-imx1-core.c b/drivers/pinctrl/pinctrl-imx1-core.c
index f77914ac081a..17aecde1b51d 100644
--- a/drivers/pinctrl/pinctrl-imx1-core.c
+++ b/drivers/pinctrl/pinctrl-imx1-core.c
@@ -638,6 +638,13 @@ int imx1_pinctrl_core_probe(struct platform_device *pdev,
                 return -EINVAL;
         }
 
+        ret = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);
+        if (ret) {
+                pinctrl_unregister(ipctl->pctl);
+                dev_err(&pdev->dev, "Failed to populate subdevices\n");
+                return ret;
+        }
+
         dev_info(&pdev->dev, "initialized IMX pinctrl driver\n");
 
         return 0;