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 2579d70..1694ef8 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 38727a2..63e9231 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 ee2ad2d..2d57c6f 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 {