From: Vladimir Oltean <vladimir.oltean@nxp.com>
To: Shawn Guo <shawnguo@kernel.org>, Li Yang <leoyang.li@nxp.com>,
Rob Herring <robh+dt@kernel.org>,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org
Cc: Adrian Hunter <adrian.hunter@intel.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
Ashish Kumar <Ashish.Kumar@nxp.com>,
Yangbo Lu <yangbo.lu@nxp.com>, Michael Walle <michael@walle.cc>
Subject: [PATCH] arm64: dts: ls1028a: make the eMMC and SD card controllers use fixed indices
Date: Thu, 19 Nov 2020 17:50:25 +0200 [thread overview]
Message-ID: <20201119155025.965941-1-vladimir.oltean@nxp.com> (raw)
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
next reply other threads:[~2020-11-19 15:50 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-19 15:50 Vladimir Oltean [this message]
2020-11-19 16:08 ` [PATCH] arm64: dts: ls1028a: make the eMMC and SD card controllers use fixed indices 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201119155025.965941-1-vladimir.oltean@nxp.com \
--to=vladimir.oltean@nxp.com \
--cc=Ashish.Kumar@nxp.com \
--cc=adrian.hunter@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=michael@walle.cc \
--cc=robh+dt@kernel.org \
--cc=shawnguo@kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=yangbo.lu@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).