Skip to contentSkip to conversation

arm64: dts: rockchip: fix mmc aliases for Radxa ZERO 3E/3W

PATCH Applied FUKAUMI Naoki 2 participants 2 messages Jun 20, 2024 – Jun 24, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 arm64: dts: rockchip: fix mmc aliases for Radxa ZERO 3E/3W

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")

Changes in v3:
- fix syntax error in rk3566-radxa-zero-3e.dts
Changes in v2:
- microSD is mmc0 instead of mmc1 for ZERO 3E

---
 arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi | 4 ----
 arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3e.dts | 1 +
 arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts | 3 ++-
 3 files changed, 3 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi +0 -4
index 623d5939d194..081be841b286 100644
@@ -6,10 +6,6 @@
 #include "rk3566.dtsi"
 
 / {
-	aliases {
-		mmc0 = &sdmmc0;
-	};
-
 	chosen {
 		stdout-path = "serial2:1500000n8";
 	};
arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3e.dts +1 -0
index e166d66990b9..4a830eb09f0b 100644
@@ -10,6 +10,7 @@ / {
 
 	aliases {
 		ethernet0 = &gmac1;
+		mmc0 = &sdmmc0;
 	};
 };
 
arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts +2 -1
index 9bf4f464915f..f92475c59deb 100644
@@ -9,7 +9,8 @@ / {
 	compatible = "radxa,zero-3w", "rockchip,rk3566";
 
 	aliases {
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc0;
 		mmc2 = &sdmmc1;
 	};
 
Signature · 7 lines
2.43.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
maintainer Applied
#1 lore raw
Quoted 9 lines · FUKAUMI Naoki

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.

[...]

Applied, thanks!

[1/1] arm64: dts: rockchip: fix mmc aliases for Radxa ZERO 3E/3W

      commit: 060c1950037e4c54ca4d8186a8f46269e35db901

Best regards,

Signature · 1 line
Heiko Stuebner <[email protected]>