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 <ansuels...@gmail.com>
> ---
> arch/arm/dts/mt7988-rfb.dts | 2 +-
> arch/arm/dts/mt7988-sd-rfb.dts | 2 +-
> arch/arm/dts/mt7988.dtsi | 8 +++-----
> 3 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/dts/mt7988-rfb.dts b/arch/arm/dts/mt7988-
> rfb.dts
> index 2579d7099fb..1694ef8d9c3 100644
> --- 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 38727a271b2..63e923137c2 100644
> --- 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 ee2ad2dbe6e..2d57c6f5709 100644
> --- 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 {
> --
> 2.47.1
>
Thanks!
Reviewed-by: Weijie Gao <weijie....@mediatek.com>
Tested-by: Weijie Gao <weijie....@mediatek.com>
