Skip to contentSkip to conversation

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

PATCH In review FUKAUMI Naoki 2 participants 3 messages Jun 19, 2024 – Jun 20, 2024

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

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

align with other Radxa products.

- mmc0 is eMMC
- mmc1 is microSD

Fixes 1a5c8d307c83 ("arm64: dts: rockchip: Add Radxa ZERO 3W/3E")
---
 arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi | 2 +-
 arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi +1 -1
index 623d5939d194..85d76d535338 100644
@@ -7,7 +7,7 @@
 
 / {
 	aliases {
-		mmc0 = &sdmmc0;
+		mmc1 = &sdmmc0;
 	};
 
 	chosen {
arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts +1 -1
index 9bf4f464915f..188147c4b78b 100644
@@ -9,7 +9,7 @@ / {
 	compatible = "radxa,zero-3w", "rockchip,rk3566";
 
 	aliases {
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
 		mmc2 = &sdmmc1;
 	};
 
Signature · 1 line
2.43.0
maintainer
#1 lore raw

Hi,

Am Donnerstag, 20. Juni 2024, 01:27:34 CEST schrieb FUKAUMI Naoki:

Quoted 5 lines

align with other Radxa products.

- mmc0 is eMMC
- mmc1 is microSD

so yes we can still change the mmc aliases as the zero will only become part of 6.11 But mmc aliases should start at 0 and not contain holes.

So if you care much about the ordering, move the alias block out of the zero-3.dtsi and introduce separate blocks for each board.

In zero-3w:

  	aliases {
		mmc0 = &sdmmc0;

};

In zero-3w:

  	aliases {
		mmc0 = &sdhci;
		mmc1 = &sdmmc0;

mmc2 = &sdmmc1;
};

Alternatively, leave the aliases as they are now
Heiko

Quoted 34 lines
Fixes 1a5c8d307c83 ("arm64: dts: rockchip: Add Radxa ZERO 3W/3E")
---
 arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi | 2 +-
 arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi +1 -1
index 623d5939d194..85d76d535338 100644
@@ -7,7 +7,7 @@
 
 / {
 	aliases {
-		mmc0 = &sdmmc0;
+		mmc1 = &sdmmc0;
 	};
 
 	chosen {
arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts +1 -1
index 9bf4f464915f..188147c4b78b 100644
@@ -9,7 +9,7 @@ / {
 	compatible = "radxa,zero-3w", "rockchip,rk3566";
 
 	aliases {
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
 		mmc2 = &sdmmc1;
 	};
 
#2 lore raw

Hi,

Quoted 21 lines · Heiko Stübner

Hi,

Am Donnerstag, 20. Juni 2024, 01:27:34 CEST schrieb FUKAUMI Naoki:

Quoted 5 lines

align with other Radxa products.

- mmc0 is eMMC
- mmc1 is microSD

so yes we can still change the mmc aliases as the zero will only become part of 6.11 But mmc aliases should start at 0 and not contain holes.

So if you care much about the ordering, move the alias block out of the zero-3.dtsi and introduce separate blocks for each board.

In zero-3w:

   	aliases {
		mmc0 = &sdmmc0;
   	};
Quoted 6 lines

In zero-3w:

   	aliases {
		mmc0 = &sdhci;
		mmc1 = &sdmmc0;
   		mmc2 = &sdmmc1;
   	};

okay, I'll send v2.
thank you for your comment.

Best regards,

--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.

Quoted 30 lines

Alternatively, leave the aliases as they are now
Heiko

Quoted 27 lines
Fixes 1a5c8d307c83 ("arm64: dts: rockchip: Add Radxa ZERO 3W/3E")
---
  arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi | 2 +-
  arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi +1 -1
index 623d5939d194..85d76d535338 100644
@@ -7,7 +7,7 @@
 
  / {
  	aliases {
-		mmc0 = &sdmmc0;
+		mmc1 = &sdmmc0;
  	};
 
  	chosen {
arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts +0 -0
index 9bf4f464915f..188147c4b78b 100644
@@ -9,7 +9,7 @@ / {
  	compatible = "radxa,zero-3w", "rockchip,rk3566";
 
Quoted 12 lines

arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts / { · line 15

Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts +1 -1
  	aliases {
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
  		mmc2 = &sdmmc1;
  	};
 

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip