[PATCH 6/8] mediatek: mt7981: move gpio-controller up and rename pinctrl to pio

[Weijie Gao (高惟杰)]

On Mon, 2025-01-27 at 14:40 +0100, Christian Marangi wrote:
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
> 
> 
> 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 at gmail.com>
> ---
>  arch/arm/dts/mt7981-emmc-rfb.dts | 4 ++--
>  arch/arm/dts/mt7981-rfb.dts      | 4 ++--
>  arch/arm/dts/mt7981-sd-rfb.dts   | 4 ++--
>  arch/arm/dts/mt7981.dtsi         | 8 +++-----
>  4 files changed, 9 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/arm/dts/mt7981-emmc-rfb.dts b/arch/arm/dts/mt7981-
> emmc-rfb.dts
> index d6590f01cf8..67f178bc232 100644
> --- 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 d6ebd6539c3..08e1b76b473 100644
> --- 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 2adbc374725..2f43e65ac5b 100644
> --- 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 3c8b9ab0574..b2c4cd7b54a 100644
> --- a/arch/arm/dts/mt7981.dtsi
> +++ b/arch/arm/dts/mt7981.dtsi
> @@ -106,7 +106,7 @@
>                 bootph-all;
>         };
> 
> -       pinctrl: pinctrl at 11d00000 {
> +       pio: pinctrl at 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 at 10048000 {
> --
> 2.47.1
> 

Thanks!

Reviewed-by: Weijie Gao <weijie.gao at mediatek.com>
Tested-by: Weijie Gao <weijie.gao at mediatek.com>