| Message ID | 20201220213513.27318-1-michael@walle.cc |
|---|---|
| State | Accepted |
| Commit | e668bec96a5f8d9f6c1619038e8147816f040192 |
| Headers | show |
| Series | board: kontron: sl28: reorder mmc devices | expand |
On Sun, Dec 20, 2020 at 10:35:13PM +0100, Michael Walle wrote: > 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> > --- > Hi Tom, > > u-boot 2021.01 will be the first version which supports the sl28 board. It > would be nice if this patch still make it into the relase, so it will be > consistent starting with the first u-boot version which supports the board. OK, thanks, I'll grab this right now then.
On Sun, Dec 20, 2020 at 10:35:13PM +0100, Michael Walle wrote: > 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> Applied to u-boot/master, thanks!
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) \
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> --- Hi Tom, u-boot 2021.01 will be the first version which supports the sl28 board. It would be nice if this patch still make it into the relase, so it will be consistent starting with the first u-boot version which supports the board. arch/arm/dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi | 4 ++-- include/configs/kontron_sl28.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)