Add support for gpio-controller property in root pinctrl node.
This is to follow upstream linux DTSI that doesn't define the
gpio-controller and cells in dedicated nodes.

Signed-off-by: Christian Marangi <ansuels...@gmail.com>
---
 drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c 
b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 37fc28bb779..ede3959c94f 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -761,6 +761,15 @@ static int mtk_gpiochip_register(struct udevice *parent)
        if (!drv)
                return -ENOENT;
 
+       /*
+        * Support upstream linux DTSI that define gpio-controller
+        * in the root node (instead of a dedicated subnode)
+        */
+       if (dev_read_bool(parent, "gpio-controller")) {
+               node = dev_ofnode(parent);
+               goto bind;
+       }
+
        ret = -ENOENT;
        dev_for_each_subnode(node, parent)
                if (ofnode_read_bool(node, "gpio-controller")) {
@@ -771,6 +780,7 @@ static int mtk_gpiochip_register(struct udevice *parent)
        if (ret)
                return ret;
 
+bind:
        ret = device_bind_with_driver_data(parent, &mtk_gpio_driver,
                                           "mediatek_gpio", 0, node,
                                           &dev);
-- 
2.45.1

Reply via email to