Skip to contentSkip to conversation

arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SoM boards

PATCH Applied Jagan Teki 2 participants 3 messages Jan 18, 2023 – Jan 19, 2023

Subsystems (2)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH v2 1/2 arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SoM boards

Radxa has produced Compute Modules like RK3399pro VMARC and CM3i with onboarding eMMC flash, so the eMMC is the primary MMC device.

On the other hand, Rockchip boot orders start from eMMC from an MMC device perspective.

Mark, the eMMC has mmc0 to satisfy the above two conditions.

---
Changes for v2:
- none

 arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 4 ++--
 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi +2 -2
index bf9eb0405b62..8b8992a8e9c0 100644
@@ -13,8 +13,8 @@ / {
 	compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro";
 
 	aliases {
-		mmc0 = &sdmmc;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 	};
 
 	vcc3v3_pcie: vcc-pcie-regulator {
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +1 -2
index fb96019b0e87..0372dd97c392 100644
@@ -8,8 +8,7 @@ / {
 	compatible = "radxa,e25", "rockchip,rk3568";
 
 	aliases {
-		mmc0 = &sdmmc0;
-		mmc1 = &sdhci;
+		mmc1 = &sdmmc0;
 	};
 
 	pwm-leds {
Signature · 7 lines
2.25.1


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

PATCH v2 2/2 arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SBC boards

Radxa SBC boards like ROCK 3A/4 models do support eMMC and SDcard via external connector slots.

Mark, the eMMC has mmc0 by considering the Rockchip boot order priority as both MMC devices are connected externally.

---
Changes for v2:
- none

 arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts | 4 ++--
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi   | 4 ++--
 arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts +2 -2
index 309c35d7fca8..028eb508ae30 100644
@@ -15,8 +15,8 @@ / {
 	compatible = "radxa,rock-4c-plus", "rockchip,rk3399";
 
 	aliases {
-		mmc0 = &sdmmc;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 	};
 
 	chosen {
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +2 -2
index 1f76d3501bda..907071d4fe80 100644
@@ -13,8 +13,8 @@
 
 / {
 	aliases {
-		mmc0 = &sdmmc;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc;
 	};
 
 	chosen {
arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +2 -2
index cd1e1d8e1244..77ba37ce6d6c 100644
@@ -13,8 +13,8 @@ / {
 
 	aliases {
 		ethernet0 = &gmac1;
-		mmc0 = &sdmmc0;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc0;
 	};
 
 	chosen: chosen {
Signature · 7 lines
2.25.1


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
maintainer Applied
#2 lore raw
In reply to Jagan Teki
Quoted 9 lines · Jagan Teki

Radxa has produced Compute Modules like RK3399pro VMARC and CM3i with onboarding eMMC flash, so the eMMC is the primary MMC device.

On the other hand, Rockchip boot orders start from eMMC from an MMC device perspective.

Mark, the eMMC has mmc0 to satisfy the above two conditions.

[...]

Applied, thanks!

[1/2] arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SoM boards

      commit: c80992abd2877590059e9cb254213c16824e2106
[2/2] arm64: dts: rockchip: Update eMMC, SD aliases for Radxa SBC boards
      commit: d268da063b99cf1c4d8304a33c27bbed0763a474

Best regards,

Signature · 6 lines
Heiko Stuebner <[email protected]>

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