mediatek: mt7988: move gpio-controller up and rename pinctrl to pio

Move gpio-controller up to pinctrl node and rename label to "pio" to
match the label used in upstream kernel linux.

Update any DTS that reference the pinctrl to follow the new naming and
structure.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Reviewed-by: Weijie Gao <weijie.gao@mediatek.com>
Tested-by: Weijie Gao <weijie.gao@mediatek.com>

diff --git a/arch/arm/dts/mt7988-rfb.dts b/arch/arm/dts/mt7988-rfb.dts
index 2579d7099fb2cea11e18fb8be30685f5800395d8..1694ef8d9c37e08e07a347b40e8cad0fb9e37ab8 100644 (file)
--- a/arch/arm/dts/mt7988-rfb.dts
+++ b/arch/arm/dts/mt7988-rfb.dts
@@ -80,7 +80,7 @@
        status = "disabled";
 };
 
-&pinctrl {
+&pio {
        i2c1_pins: i2c1-pins {
                mux {
                        function = "i2c";

diff --git a/arch/arm/dts/mt7988-sd-rfb.dts b/arch/arm/dts/mt7988-sd-rfb.dts
index 38727a271b282e8e0deecea17c95f605aeba9d8d..63e923137c21e42400b03047a2bb83ffd8a69e1e 100644 (file)
--- a/arch/arm/dts/mt7988-sd-rfb.dts
+++ b/arch/arm/dts/mt7988-sd-rfb.dts
@@ -53,7 +53,7 @@
        };
 };
 
-&pinctrl {
+&pio {
        i2c1_pins: i2c1-pins {
                mux {
                        function = "i2c";

diff --git a/arch/arm/dts/mt7988.dtsi b/arch/arm/dts/mt7988.dtsi
index ee2ad2dbe6edb78cbde8721d08ce478807b62de1..2d57c6f5709b57871b96d5bd4576c98888fb7018 100644 (file)
--- a/arch/arm/dts/mt7988.dtsi
+++ b/arch/arm/dts/mt7988.dtsi
@@ -110,7 +110,7 @@
                #clock-cells = <1>;
        };
 
-       pinctrl: pinctrl@1001f000 {
+       pio: pinctrl@1001f000 {
                compatible = "mediatek,mt7988-pinctrl";
                reg = <0 0x1001f000 0 0x1000>,
                      <0 0x11c10000 0 0x1000>,
@@ -122,10 +122,8 @@
                reg-names = "gpio", "iocfg_tr", "iocfg_br",
                            "iocfg_rb", "iocfg_lb", "iocfg_tl",
                            "eint";
-               gpio: gpio-controller {
-                       gpio-controller;
-                       #gpio-cells = <2>;
-               };
+               gpio-controller;
+               #gpio-cells = <2>;
        };
 
        sgmiisys0: syscon@10060000 {