[PATCH v2 10/10] rockchip: gpio: Add missing gpio aliases

[Kever Yang]

On 2024/8/3 06:56, Jonas Karlman wrote:
> Add aliases for gpio controllers to soc u-boot dtsi files that are
> missing aliases in soc dtsi files to ensure dev_seq() return the
> expected number when a gpio controller is included in SPL.
>
> Also drop the aliases from rk3288-u-boot.dtsi, they are already part of
> rk3288.dtsi.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
> v2: New patch
> ---
>   arch/arm/dts/px30-u-boot.dtsi    | 4 ++++
>   arch/arm/dts/rk3066a-u-boot.dtsi | 7 +++++++
>   arch/arm/dts/rk3288-u-boot.dtsi  | 9 ---------
>   arch/arm/dts/rk3xxx-u-boot.dtsi  | 7 +++++++
>   arch/arm/dts/rv1108-u-boot.dtsi  | 9 +++++++++
>   arch/arm/dts/rv1126-u-boot.dtsi  | 8 ++++++++
>   6 files changed, 35 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/dts/px30-u-boot.dtsi b/arch/arm/dts/px30-u-boot.dtsi
> index abc6b49e6663..3dc70d4e432b 100644
> --- a/arch/arm/dts/px30-u-boot.dtsi
> +++ b/arch/arm/dts/px30-u-boot.dtsi
> @@ -7,6 +7,10 @@
>   
>   / {
>   	aliases {
> +		gpio0 = &gpio0;
> +		gpio1 = &gpio1;
> +		gpio2 = &gpio2;
> +		gpio3 = &gpio3;
>   		mmc0 = &emmc;
>   		mmc1 = &sdmmc;
>   	};
> diff --git a/arch/arm/dts/rk3066a-u-boot.dtsi b/arch/arm/dts/rk3066a-u-boot.dtsi
> index 35b52d6fb7f3..60d18d2daeac 100644
> --- a/arch/arm/dts/rk3066a-u-boot.dtsi
> +++ b/arch/arm/dts/rk3066a-u-boot.dtsi
> @@ -3,6 +3,13 @@
>   #include "rockchip-u-boot.dtsi"
>   #include "rk3xxx-u-boot.dtsi"
>   
> +/ {
> +	aliases {
> +		gpio4 = &gpio4;
> +		gpio6 = &gpio6;
> +	};
> +};
> +
>   &gpio0 {
>   	gpio-ranges = <&pinctrl 0 0 32>;
>   };
> diff --git a/arch/arm/dts/rk3288-u-boot.dtsi b/arch/arm/dts/rk3288-u-boot.dtsi
> index 0f8053a8b690..379d9413adee 100644
> --- a/arch/arm/dts/rk3288-u-boot.dtsi
> +++ b/arch/arm/dts/rk3288-u-boot.dtsi
> @@ -7,15 +7,6 @@
>   
>   / {
>   	aliases {
> -		gpio0 = &gpio0;
> -		gpio1 = &gpio1;
> -		gpio2 = &gpio2;
> -		gpio3 = &gpio3;
> -		gpio4 = &gpio4;
> -		gpio5 = &gpio5;
> -		gpio6 = &gpio6;
> -		gpio7 = &gpio7;
> -		gpio8 = &gpio8;
>   		mmc0 = &emmc;
>   		mmc1 = &sdmmc;
>   		mmc2 = &sdio0;
> diff --git a/arch/arm/dts/rk3xxx-u-boot.dtsi b/arch/arm/dts/rk3xxx-u-boot.dtsi
> index 6af6a451ea78..097407ca72dc 100644
> --- a/arch/arm/dts/rk3xxx-u-boot.dtsi
> +++ b/arch/arm/dts/rk3xxx-u-boot.dtsi
> @@ -1,6 +1,13 @@
>   // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>   
>   / {
> +	aliases {
> +		gpio0 = &gpio0;
> +		gpio1 = &gpio1;
> +		gpio2 = &gpio2;
> +		gpio3 = &gpio3;
> +	};
> +
>   	noc: syscon at 10128000 {
>   		compatible = "rockchip,rk3188-noc", "syscon";
>   		reg = <0x10128000 0x2000>;
> diff --git a/arch/arm/dts/rv1108-u-boot.dtsi b/arch/arm/dts/rv1108-u-boot.dtsi
> index f772d618bd1d..58711e8b2f8a 100644
> --- a/arch/arm/dts/rv1108-u-boot.dtsi
> +++ b/arch/arm/dts/rv1108-u-boot.dtsi
> @@ -5,6 +5,15 @@
>   
>   #include "rockchip-u-boot.dtsi"
>   
> +/ {
> +	aliases {
> +		gpio0 = &gpio0;
> +		gpio1 = &gpio1;
> +		gpio2 = &gpio2;
> +		gpio3 = &gpio3;
> +	};
> +};
> +
>   &gpio0 {
>   	gpio-ranges = <&pinctrl 0 0 32>;
>   };
> diff --git a/arch/arm/dts/rv1126-u-boot.dtsi b/arch/arm/dts/rv1126-u-boot.dtsi
> index 3e6df1e433db..05b5f5260dd5 100644
> --- a/arch/arm/dts/rv1126-u-boot.dtsi
> +++ b/arch/arm/dts/rv1126-u-boot.dtsi
> @@ -6,6 +6,14 @@
>   #include "rockchip-u-boot.dtsi"
>   
>   / {
> +	aliases {
> +		gpio0 = &gpio0;
> +		gpio1 = &gpio1;
> +		gpio2 = &gpio2;
> +		gpio3 = &gpio3;
> +		gpio4 = &gpio4;
> +	};
> +
>   	chosen {
>   		u-boot,spl-boot-order = \
>   			"same-as-spl", &emmc, &sdmmc;