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.

Reported-by: FUKAUMI Naoki <naoki@radxa.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Link: https://lore.kernel.org/r/20230118080454.11643-2-jagan@amarulasolutions.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
index 309c35d7fca89b439eb8c653922eb99a30f67e92..028eb508ae3026c933cadbe1333a1939c563d225 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
@@ -15,8 +15,8 @@
        compatible = "radxa,rock-4c-plus", "rockchip,rk3399";
 
        aliases {
-               mmc0 = &sdmmc;
-               mmc1 = &sdhci;
+               mmc0 = &sdhci;
+               mmc1 = &sdmmc;
        };
 
        chosen {

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
index 1f76d3501bda31fdbb66636c3562cd9e7f291b5a..907071d4fe80445b23a8b6b6a5f36fa382dd65f3 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -13,8 +13,8 @@
 
 / {
        aliases {
-               mmc0 = &sdmmc;
-               mmc1 = &sdhci;
+               mmc0 = &sdhci;
+               mmc1 = &sdmmc;
        };
 
        chosen {

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
index 00d873a03cfee95a4f8f07df567abf8b9e31f1f9..339a4bb599061ae9b2fe916987775111cc1f8848 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
@@ -13,8 +13,8 @@
 
        aliases {
                ethernet0 = &gmac1;
-               mmc0 = &sdmmc0;
-               mmc1 = &sdhci;
+               mmc0 = &sdhci;
+               mmc1 = &sdmmc0;
        };
 
        chosen: chosen {