pinctrl: mediatek: Bind gpio while binding pinctrl

Mediatek pinctrl drivers call mtk_gpiochip_register() to bind the child
gpio controller as part of mtk_pinctrl_common_probe(). This breaks
gpiohog support because the gpio controller is bound too late for
DM_FLAG_PROBE_AFTER_BIND (set while binding hogs) to work.

Move the mtk_gpiochip_register() to mtk_pinctrl_common_bind() and call
this as the .bind method of each of the mediatek pinctrl drivers.

Signed-off-by: Chris Webb <chris@arachsys.com>

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7622.c b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
index 114f260..46a5b66 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt7622.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7622.c
@@ -749,6 +749,7 @@ U_BOOT_DRIVER(mt7622_pinctrl) = {
        .id = UCLASS_PINCTRL,
        .of_match = mt7622_pctrl_match,
        .ops = &mtk_pinctrl_ops,
+       .bind = mtk_pinctrl_common_bind,
        .probe = mtk_pinctrl_mt7622_probe,
        .priv_auto      = sizeof(struct mtk_pinctrl_priv),
 };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7623.c b/drivers/pinctrl/mediatek/pinctrl-mt7623.c
index 2703e6f..55e49a7 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt7623.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7623.c
@@ -1410,6 +1410,7 @@ U_BOOT_DRIVER(mt7623_pinctrl) = {
        .id = UCLASS_PINCTRL,
        .of_match = mt7623_pctrl_match,
        .ops = &mtk_pinctrl_ops,
+       .bind = mtk_pinctrl_common_bind,
        .probe = mtk_pinctrl_mt7623_probe,
        .priv_auto      = sizeof(struct mtk_pinctrl_priv),
 };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7629.c b/drivers/pinctrl/mediatek/pinctrl-mt7629.c
index 45d4def..3b82423 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt7629.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7629.c
@@ -413,6 +413,7 @@ U_BOOT_DRIVER(mt7629_pinctrl) = {
        .id = UCLASS_PINCTRL,
        .of_match = mt7629_pctrl_match,
        .ops = &mtk_pinctrl_ops,
+       .bind = mtk_pinctrl_common_bind,
        .probe = mtk_pinctrl_mt7629_probe,
        .priv_auto      = sizeof(struct mtk_pinctrl_priv),
 };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7981.c b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
index 4bc4abe..047e37b 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt7981.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7981.c
@@ -1048,6 +1048,7 @@ U_BOOT_DRIVER(mt7981_pinctrl) = {
        .id = UCLASS_PINCTRL,
        .of_match = mt7981_pctrl_match,
        .ops = &mtk_pinctrl_ops,
+       .bind = mtk_pinctrl_common_bind,
        .probe = mtk_pinctrl_mt7981_probe,
        .priv_auto = sizeof(struct mtk_pinctrl_priv),
        .flags = DM_FLAG_PRE_RELOC,

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7986.c b/drivers/pinctrl/mediatek/pinctrl-mt7986.c
index 819d644..bf8cd03 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt7986.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7986.c
@@ -773,6 +773,7 @@ U_BOOT_DRIVER(mt7986_pinctrl) = {
        .id = UCLASS_PINCTRL,
        .of_match = mt7986_pctrl_match,
        .ops = &mtk_pinctrl_ops,
+       .bind = mtk_pinctrl_common_bind,
        .probe = mtk_pinctrl_mt7986_probe,
        .priv_auto = sizeof(struct mtk_pinctrl_priv),
 };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt7988.c b/drivers/pinctrl/mediatek/pinctrl-mt7988.c
index 03a38e8..1f384e8 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt7988.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt7988.c
@@ -1269,6 +1269,7 @@ U_BOOT_DRIVER(mt7988_pinctrl) = {
        .id = UCLASS_PINCTRL,
        .of_match = mt7988_pctrl_match,
        .ops = &mtk_pinctrl_ops,
+       .bind = mtk_pinctrl_common_bind,
        .probe = mtk_pinctrl_mt7988_probe,
        .priv_auto = sizeof(struct mtk_pinctrl_priv),
 };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8512.c b/drivers/pinctrl/mediatek/pinctrl-mt8512.c
index bc5fb83..5a8dd4d 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8512.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8512.c
@@ -382,6 +382,7 @@ U_BOOT_DRIVER(mt8512_pinctrl) = {
        .id = UCLASS_PINCTRL,
        .of_match = mt8512_pctrl_match,
        .ops = &mtk_pinctrl_ops,
+       .bind = mtk_pinctrl_common_bind,
        .probe = mtk_pinctrl_mt8512_probe,
        .priv_auto      = sizeof(struct mtk_pinctrl_priv),
 };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8516.c b/drivers/pinctrl/mediatek/pinctrl-mt8516.c
index 7487d6f..9c25066 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8516.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8516.c
@@ -388,6 +388,7 @@ U_BOOT_DRIVER(mt8516_pinctrl) = {
        .id = UCLASS_PINCTRL,
        .of_match = mt8516_pctrl_match,
        .ops = &mtk_pinctrl_ops,
+       .bind = mtk_pinctrl_common_bind,
        .probe = mtk_pinctrl_mt8516_probe,
        .priv_auto      = sizeof(struct mtk_pinctrl_priv),
 };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8518.c b/drivers/pinctrl/mediatek/pinctrl-mt8518.c
index 66fcfdf..333184a 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8518.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8518.c
@@ -408,6 +408,7 @@ U_BOOT_DRIVER(mt8518_pinctrl) = {
        .id = UCLASS_PINCTRL,
        .of_match = mt8518_pctrl_match,
        .ops = &mtk_pinctrl_ops,
+       .bind = mtk_pinctrl_common_bind,
        .probe = mtk_pinctrl_mt8518_probe,
        .priv_auto      = sizeof(struct mtk_pinctrl_priv),
 };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index ede3959..a3662d4 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -791,11 +791,20 @@ bind:
 }
 #endif
 
+int mtk_pinctrl_common_bind(struct udevice *dev)
+{
+#if CONFIG_IS_ENABLED(DM_GPIO) || \
+    (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_GPIO))
+       return mtk_gpiochip_register(dev);
+#else
+       return 0;
+#endif
+}
+
 int mtk_pinctrl_common_probe(struct udevice *dev,
                             const struct mtk_pinctrl_soc *soc)
 {
        struct mtk_pinctrl_priv *priv = dev_get_priv(dev);
-       int ret = 0;
        u32 i = 0;
        fdt_addr_t addr;
        u32 base_calc = soc->base_calc;
@@ -813,10 +822,5 @@ int mtk_pinctrl_common_probe(struct udevice *dev,
                priv->base[i] = (void __iomem *)addr;
        }
 
-#if CONFIG_IS_ENABLED(DM_GPIO) || \
-    (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_GPIO))
-       ret = mtk_gpiochip_register(dev);
-#endif
-
-       return ret;
+       return 0;
 }

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
index c948b80..15ab3c1 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
@@ -241,6 +241,7 @@ extern const struct pinctrl_ops mtk_pinctrl_ops;
 /* A common read-modify-write helper for MediaTek chips */
 void mtk_rmw(struct udevice *dev, u32 reg, u32 mask, u32 set);
 void mtk_i_rmw(struct udevice *dev, u8 i, u32 reg, u32 mask, u32 set);
+int mtk_pinctrl_common_bind(struct udevice *dev);
 int mtk_pinctrl_common_probe(struct udevice *dev,
                             const struct mtk_pinctrl_soc *soc);