From: Michael Walle <michael@walle.cc>
Date: Sun, 20 Dec 2020 21:35:13 +0000 (+0100)
Subject: board: kontron: sl28: reorder mmc devices
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=e668bec96a5f8d9f6c1619038e8147816f040192;p=u-boot.git

board: kontron: sl28: reorder mmc devices

Since linux commit 2e6cde96873253fd9eb0f20afd8ffd18278cff75 ("arm64:
dts: ls1028a: make the eMMC and SD card controllers use fixed indices")
mmc0 is the eMMC and mmc1 is the SD card. Also swap it in u-boot to
avoid any confusion by the user and to be aligned with linux.

Signed-off-by: Michael Walle <michael@walle.cc>
---

diff --git a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
index 2375549c6e..e63684c334 100644
--- a/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi
@@ -4,8 +4,8 @@
 
 / {
 	aliases {
-		mmc0 = &esdhc0;
-		mmc1 = &esdhc1;
+		mmc0 = &esdhc1;
+		mmc1 = &esdhc0;
 		i2c0 = &i2c0;
 		i2c1 = &i2c3;
 		i2c2 = &i2c4;
diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h
index afe512a8c7..442fb58b97 100644
--- a/include/configs/kontron_sl28.h
+++ b/include/configs/kontron_sl28.h
@@ -89,8 +89,8 @@
 	"ramdisk_addr_r=0x88080000\0"
 
 #define BOOT_TARGET_DEVICES(func) \
-	func(MMC, mmc, 1) \
 	func(MMC, mmc, 0) \
+	func(MMC, mmc, 1) \
 	func(NVME, nvme, 0) \
 	func(USB, usb, 0) \
 	func(DHCP, dhcp, 0) \