mediatek: mt7981: 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/mt7981-emmc-rfb.dts b/arch/arm/dts/mt7981-emmc-rfb.dts
index d6590f01cf8a01ca3ec5af0626bf05a31b5a4072..67f178bc23264f4bb17a83588d5b59de7f331282 100644 (file)
--- a/arch/arm/dts/mt7981-emmc-rfb.dts
+++ b/arch/arm/dts/mt7981-emmc-rfb.dts
@@ -48,7 +48,7 @@
        mediatek,gmac-id = <0>;
        phy-mode = "2500base-x";
        mediatek,switch = "mt7531";
-       reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>;
+       reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
 
        fixed-link {
                speed = <2500>;
@@ -56,7 +56,7 @@
        };
 };
 
-&pinctrl {
+&pio {
        spic_pins: spi1-pins-func-1 {
                mux {
                        function = "spi";

diff --git a/arch/arm/dts/mt7981-rfb.dts b/arch/arm/dts/mt7981-rfb.dts
index d6ebd6539c3d604489abb6b12bacc911767f1bf5..08e1b76b4739ef15601db912338216b8f71bcb4b 100644 (file)
--- a/arch/arm/dts/mt7981-rfb.dts
+++ b/arch/arm/dts/mt7981-rfb.dts
@@ -39,7 +39,7 @@
        mediatek,gmac-id = <0>;
        phy-mode = "2500base-x";
        mediatek,switch = "mt7531";
-       reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>;
+       reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
 
        fixed-link {
                speed = <2500>;
@@ -47,7 +47,7 @@
        };
 };
 
-&pinctrl {
+&pio {
        spi_flash_pins: spi0-pins-func-1 {
                mux {
                        function = "flash";

diff --git a/arch/arm/dts/mt7981-sd-rfb.dts b/arch/arm/dts/mt7981-sd-rfb.dts
index 2adbc3747254437c19e4f00a0018bd339d7fec7f..2f43e65ac5bc558fdba1d7f970e5852e74fbdd3f 100644 (file)
--- a/arch/arm/dts/mt7981-sd-rfb.dts
+++ b/arch/arm/dts/mt7981-sd-rfb.dts
@@ -48,7 +48,7 @@
        mediatek,gmac-id = <0>;
        phy-mode = "2500base-x";
        mediatek,switch = "mt7531";
-       reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>;
+       reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
 
        fixed-link {
                speed = <2500>;
@@ -56,7 +56,7 @@
        };
 };
 
-&pinctrl {
+&pio {
        spic_pins: spi1-pins-func-1 {
                mux {
                        function = "spi";

diff --git a/arch/arm/dts/mt7981.dtsi b/arch/arm/dts/mt7981.dtsi
index 3c8b9ab0574b69983bfad444d166022bcea52fdb..b2c4cd7b54abf73d449fa8081b8e0056ec6a996f 100644 (file)
--- a/arch/arm/dts/mt7981.dtsi
+++ b/arch/arm/dts/mt7981.dtsi
@@ -106,7 +106,7 @@
                bootph-all;
        };
 
-       pinctrl: pinctrl@11d00000 {
+       pio: pinctrl@11d00000 {
                compatible = "mediatek,mt7981-pinctrl";
                reg = <0x11d00000 0x1000>,
                      <0x11c00000 0x1000>,
@@ -120,10 +120,8 @@
                reg-names = "gpio", "iocfg_rt", "iocfg_rm",
                            "iocfg_rb", "iocfg_lb", "iocfg_bl",
                            "iocfg_tm", "iocfg_tl", "eint";
-               gpio: gpio-controller {
-                       gpio-controller;
-                       #gpio-cells = <2>;
-               };
+               gpio-controller;
+               #gpio-cells = <2>;
        };
 
        pwm: pwm@10048000 {