[PATCH v2 2/5] arm64: dts: rockchip: fix mmc aliases for Radxa ZERO 3E/3W

[Kever Yang]

On 2024/8/3 06:12, Jonas Karlman wrote:
> From: FUKAUMI Naoki <naoki at radxa.com>
>
> align with other Radxa products.
>
> - mmc0 is eMMC
> - mmc1 is microSD
>
> for ZERO 3E, there is no eMMC, but aliases should start at 0, so mmc0
> is microSD as exception.
>
> Fixes: 1a5c8d307c83 ("arm64: dts: rockchip: Add Radxa ZERO 3W/3E")
> Signed-off-by: FUKAUMI Naoki <naoki at radxa.com>
>
> Changes in v3:
> - fix syntax error in rk3566-radxa-zero-3e.dts
> Changes in v2:
> - microSD is mmc0 instead of mmc1 for ZERO 3E
>
> Link: https://lore.kernel.org/r/20240620224435.2752-1-naoki@radxa.com
> Signed-off-by: Heiko Stuebner <heiko at sntech.de>
>
> [ upstream commit: 060c1950037e4c54ca4d8186a8f46269e35db901 ]
>
> (cherry picked from commit 8324bc7493e4088013c62bc41f49d6d181575493)
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
> v2: Add Signed-off-by tag
> ---
>   dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3.dtsi | 4 ----
>   dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3e.dts | 1 +
>   dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3w.dts | 3 ++-
>   3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3.dtsi b/dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3.dtsi
> index 623d5939d194..081be841b286 100644
> --- a/dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3.dtsi
> +++ b/dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3.dtsi
> @@ -6,10 +6,6 @@
>   #include "rk3566.dtsi"
>   
>   / {
> -	aliases {
> -		mmc0 = &sdmmc0;
> -	};
> -
>   	chosen {
>   		stdout-path = "serial2:1500000n8";
>   	};
> diff --git a/dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3e.dts b/dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3e.dts
> index e166d66990b9..4a830eb09f0b 100644
> --- a/dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3e.dts
> +++ b/dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3e.dts
> @@ -10,6 +10,7 @@
>   
>   	aliases {
>   		ethernet0 = &gmac1;
> +		mmc0 = &sdmmc0;
>   	};
>   };
>   
> diff --git a/dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3w.dts b/dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3w.dts
> index 9bf4f464915f..f92475c59deb 100644
> --- a/dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3w.dts
> +++ b/dts/upstream/src/arm64/rockchip/rk3566-radxa-zero-3w.dts
> @@ -9,7 +9,8 @@
>   	compatible = "radxa,zero-3w", "rockchip,rk3566";
>   
>   	aliases {
> -		mmc1 = &sdhci;
> +		mmc0 = &sdhci;
> +		mmc1 = &sdmmc0;
>   		mmc2 = &sdmmc1;
>   	};
>