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.

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

diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
index bf9eb0405b62724ede3dea0a424ebb09b6f4523f..8b8992a8e9c0d8a141756391ba3b68e4e9296267 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
@@ -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 {

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
index fb96019b0e8729489414548df6acdfe2e0734faa..0372dd97c392cc908037194eea377df41dc6bed5 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts
@@ -8,8 +8,7 @@
        compatible = "radxa,e25", "rockchip,rk3568";
 
        aliases {
-               mmc0 = &sdmmc0;
-               mmc1 = &sdhci;
+               mmc1 = &sdmmc0;
        };
 
        pwm-leds {