mediatek: mt7986: 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/mt7986.dtsi b/arch/arm/dts/mt7986.dtsi
index 64ce45a653019c70489b822b03a861289d9ca02f..b2c57098a5e1cce19768f300b18ac1f4c59e7408 100644 (file)
--- a/arch/arm/dts/mt7986.dtsi
+++ b/arch/arm/dts/mt7986.dtsi
@@ -122,7 +122,7 @@
                #clock-cells = <1>;
        };
 
-       pinctrl: pinctrl@1001f000 {
+       pio: pinctrl@1001f000 {
                compatible = "mediatek,mt7986-pinctrl";
                reg = <0x1001f000 0x1000>,
                      <0x11c30000 0x1000>,
@@ -135,10 +135,8 @@
                reg-names = "gpio", "iocfg_rt", "iocfg_rb",
                            "iocfg_lt", "iocfg_lb", "iocfg_tr",
                            "iocfg_tl", "eint";
-               gpio: gpio-controller {
-                       gpio-controller;
-                       #gpio-cells = <2>;
-               };
+               gpio-controller;
+               #gpio-cells = <2>;
        };
 
        pwm: pwm@10048000 {

diff --git a/arch/arm/dts/mt7986a-bpi-r3-sd.dts b/arch/arm/dts/mt7986a-bpi-r3-sd.dts
index c156a8136343d6c5614bd67de30eb3c2babfb1be..e01ae4c3dc77fe3ece75495d5a0f4a04c2c4c528 100644 (file)
--- a/arch/arm/dts/mt7986a-bpi-r3-sd.dts
+++ b/arch/arm/dts/mt7986a-bpi-r3-sd.dts
@@ -38,12 +38,12 @@
 
                factory {
                        label = "reset";
-                       gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
+                       gpios = <&pio 9 GPIO_ACTIVE_LOW>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
+                       gpios = <&pio 10 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -52,12 +52,12 @@
 
                led_status_green: green {
                        label = "green:status";
-                       gpios = <&gpio 69 GPIO_ACTIVE_HIGH>;
+                       gpios = <&pio 69 GPIO_ACTIVE_HIGH>;
                };
 
                led_status_blue: blue {
                        label = "blue:status";
-                       gpios = <&gpio 86 GPIO_ACTIVE_HIGH>;
+                       gpios = <&pio 86 GPIO_ACTIVE_HIGH>;
                };
        };
 
@@ -78,7 +78,7 @@
        mediatek,gmac-id = <0>;
        phy-mode = "2500base-x";
        mediatek,switch = "mt7531";
-       reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
+       reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>;
 
        fixed-link {
                speed = <2500>;
@@ -86,7 +86,7 @@
        };
 };
 
-&pinctrl {
+&pio {
        spic_pins: spi1-pins-func-1 {
                mux {
                        function = "spi";

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

diff --git a/arch/arm/dts/mt7986a-sd-rfb.dts b/arch/arm/dts/mt7986a-sd-rfb.dts
index 4f8fa70ec99e124ed110c3e9e78e67d80b32467f..11823e05bda387658b6176a8db59b08e3ebc8bba 100644 (file)
--- a/arch/arm/dts/mt7986a-sd-rfb.dts
+++ b/arch/arm/dts/mt7986a-sd-rfb.dts
@@ -49,7 +49,7 @@
        mediatek,gmac-id = <0>;
        phy-mode = "2500base-x";
        mediatek,switch = "mt7531";
-       reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
+       reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>;
 
        fixed-link {
                speed = <2500>;
@@ -57,7 +57,7 @@
        };
 };
 
-&pinctrl {
+&pio {
        spi_flash_pins: spi0-pins-func-1 {
                mux {
                        function = "flash";

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

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