devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next] arm64: dts: armada-3720-turris-mox: fixed indices for the SDHC controllers
@ 2021-07-22 10:11 Vladimir Oltean
  2021-07-23 12:57 ` Gregory CLEMENT
  0 siblings, 1 reply; 2+ messages in thread
From: Vladimir Oltean @ 2021-07-22 10:11 UTC (permalink / raw)
  To: devicetree
  Cc: Marek Behún, Andrew Lunn, Gregory Clement,
	Sebastian Hesselbarth, Rob Herring, Ulf Hansson,
	Douglas Anderson, Wolfram Sang, linux-arm-kernel, linux-kernel

Since drivers/mmc/host/sdhci-xenon.c declares the PROBE_PREFER_ASYNCHRONOUS
probe type, it is not guaranteed whether /dev/mmcblk0 will belong to
sdhci0 or sdhci1. In turn, this will break booting by:

root=/dev/mmcblk0p1

Fix the issue by adding aliases so that the old MMC controller indices
are preserved.

Fixes: 7320915c8861 ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.14")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
index ce2bcddf396f..f2d7d6f071bc 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
@@ -19,6 +19,8 @@ / {
 	aliases {
 		spi0 = &spi0;
 		ethernet1 = &eth1;
+		mmc0 = &sdhci0;
+		mmc1 = &sdhci1;
 	};
 
 	chosen {
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [PATCH net-next] arm64: dts: armada-3720-turris-mox: fixed indices for the SDHC controllers
  2021-07-22 10:11 [PATCH net-next] arm64: dts: armada-3720-turris-mox: fixed indices for the SDHC controllers Vladimir Oltean
@ 2021-07-23 12:57 ` Gregory CLEMENT
  0 siblings, 0 replies; 2+ messages in thread
From: Gregory CLEMENT @ 2021-07-23 12:57 UTC (permalink / raw)
  To: Vladimir Oltean, devicetree
  Cc: Marek Behún, Andrew Lunn, Sebastian Hesselbarth,
	Rob Herring, Ulf Hansson, Douglas Anderson, Wolfram Sang,
	linux-arm-kernel, linux-kernel

Hi Vladimir,

> Since drivers/mmc/host/sdhci-xenon.c declares the PROBE_PREFER_ASYNCHRONOUS
> probe type, it is not guaranteed whether /dev/mmcblk0 will belong to
> sdhci0 or sdhci1. In turn, this will break booting by:
>
> root=/dev/mmcblk0p1
>
> Fix the issue by adding aliases so that the old MMC controller indices
> are preserved.
>
> Fixes: 7320915c8861 ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.14")
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>

Applied on mvebu/fixes

Thanks,

Gregory

> ---
>  arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> index ce2bcddf396f..f2d7d6f071bc 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> @@ -19,6 +19,8 @@ / {
>  	aliases {
>  		spi0 = &spi0;
>  		ethernet1 = &eth1;
> +		mmc0 = &sdhci0;
> +		mmc1 = &sdhci1;
>  	};
>  
>  	chosen {
> -- 
> 2.25.1
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-23 12:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-22 10:11 [PATCH net-next] arm64: dts: armada-3720-turris-mox: fixed indices for the SDHC controllers Vladimir Oltean
2021-07-23 12:57 ` Gregory CLEMENT

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).