From: Tianling Shen <cnsztl@gmail.com>
Date: Tue, 22 Oct 2024 19:35:30 +0000 (+0800)
Subject: arm64: dts: rockchip: reorder mmc aliases for NanoPi R3S
X-Git-Tag: v6.13-rc1~140^2~32^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7cd1115456d312f8c5e60c80fdc35fd35ea6eab;p=thirdparty%2Fkernel%2Flinux.git

arm64: dts: rockchip: reorder mmc aliases for NanoPi R3S

Typically any non-removable storage (emmc) is listed before removable
storage (sd-card) options. Also U-Boot will try to override and use
mmc0=sdhci and mmc1=sdmmc0 for all rk356x boards.

Fixes: 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board")
Suggested-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
Link: https://lore.kernel.org/r/20241022193537.1117919-6-cnsztl@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
index 03a2f90f62170..fb1f65c868833 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts
@@ -22,8 +22,8 @@
 
 	aliases {
 		ethernet0 = &gmac1;
-		mmc0 = &sdmmc0;
-		mmc1 = &sdhci;
+		mmc0 = &sdhci;
+		mmc1 = &sdmmc0;
 	};
 
 	chosen: chosen {