linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] arm64: dts: ls1028a: make the eMMC and SD card controllers use fixed indices
@ 2020-11-19 15:50 Vladimir Oltean
  2020-11-19 16:08 ` Michael Walle
  2020-11-20  2:04 ` Y.b. Lu
  0 siblings, 2 replies; 22+ messages in thread
From: Vladimir Oltean @ 2020-11-19 15:50 UTC (permalink / raw)
  To: Shawn Guo, Li Yang, Rob Herring, linux-arm-kernel, devicetree
  Cc: Adrian Hunter, Ulf Hansson, linux-mmc, linux-kernel,
	Ashish Kumar, Yangbo Lu, Michael Walle

As the boot order in the kernel continues to change, sometimes it may
happen that the eSDHC controller mmc@2150000 (the one for eMMC) gets
probed before the one at mmc@2140000 (for external SD cards). The effect
is that the eMMC controller gets the /dev/mmcblk0 name, and the SD card
gets /dev/mmcblk1.

Since the introduction of this SoC, that has never happened in practice,
even though it was never guaranteed in theory. Setting
"root=/dev/mmcblk0p2" in /proc/cmdline has always caused the kernel to
use the second partition from the SD card as the rootfs.

Preserve that old behavior by adding some aliases which create naming
consistency:
- the SD card controller uses /dev/mmcblk0
- the eMMC controller uses /dev/mmcblk1

The aliases are parsed by mmc_alloc_host() in drivers/mmc/core/host.c.

Cc: Ashish Kumar <Ashish.Kumar@nxp.com>
Cc: Yangbo Lu <yangbo.lu@nxp.com>
Cc: Michael Walle <michael@walle.cc>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts | 2 ++
 arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts          | 2 ++
 arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts          | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
index 8161dd237971..7d292999f8da 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
@@ -23,6 +23,8 @@ aliases {
 		serial2 = &lpuart1;
 		spi0 = &fspi;
 		spi1 = &dspi2;
+		mmc0 = &esdhc;
+		mmc1 = &esdhc1;
 	};
 
 	buttons0 {
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
index 13cdc958ba3e..c0786b713791 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
@@ -23,6 +23,8 @@ aliases {
 		gpio2 = &gpio3;
 		serial0 = &duart0;
 		serial1 = &duart1;
+		mmc0 = &esdhc;
+		mmc1 = &esdhc1;
 	};
 
 	chosen {
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
index 1efb61cff454..c1d1ba459307 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
@@ -19,6 +19,8 @@ aliases {
 		crypto = &crypto;
 		serial0 = &duart0;
 		serial1 = &duart1;
+		mmc0 = &esdhc;
+		mmc1 = &esdhc1;
 	};
 
 	chosen {
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2020-12-01  2:39 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-19 15:50 [PATCH] arm64: dts: ls1028a: make the eMMC and SD card controllers use fixed indices Vladimir Oltean
2020-11-19 16:08 ` Michael Walle
2020-11-19 16:32   ` Vladimir Oltean
2020-11-20  2:04 ` Y.b. Lu
2020-11-20  9:30   ` Vladimir Oltean
2020-11-23 11:09     ` Michael Walle
2020-11-24  7:41     ` Y.b. Lu
2020-11-24  8:03       ` Michael Walle
2020-11-24  8:47         ` Y.b. Lu
2020-11-24  8:55           ` Michael Walle
2020-11-24  9:02             ` Y.b. Lu
2020-11-24  9:08               ` Michael Walle
2020-11-24  9:22                 ` Y.b. Lu
2020-11-24  9:43                   ` Michael Walle
2020-11-24 10:22                     ` Y.b. Lu
2020-11-24 10:31               ` Vladimir Oltean
2020-11-24 11:15                 ` Y.b. Lu
2020-11-24 11:28                   ` Vladimir Oltean
2020-11-25  2:59                     ` Y.b. Lu
2020-11-25  8:25                       ` Michael Walle
2020-11-30 14:29                         ` Shawn Guo
2020-12-01  2:38                           ` Y.b. Lu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).