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>
This commit is contained in:
Christian Marangi 2025-01-27 14:40:40 +01:00 committed by Tom Rini
parent 08e70f772c
commit f1775996ba
6 changed files with 17 additions and 19 deletions

View file

@ -122,7 +122,7 @@
#clock-cells = <1>;
};
pinctrl: pinctrl@1001f000 {
pio: pinctrl@1001f000 {
compatible = "mediatek,mt7986-pinctrl";
reg = <0x1001f000 0x1000>,
<0x11c30000 0x1000>,
@ -135,11 +135,9 @@
reg-names = "gpio", "iocfg_rt", "iocfg_rb",
"iocfg_lt", "iocfg_lb", "iocfg_tr",
"iocfg_tl", "eint";
gpio: gpio-controller {
gpio-controller;
#gpio-cells = <2>;
};
};
pwm: pwm@10048000 {
compatible = "mediatek,mt7986-pwm";

View file

@ -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";

View file

@ -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";

View file

@ -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";

View file

@ -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";

View file

@ -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";