[PATCH net-next] arm64: dts: armada-3720-turris-mox: fixed indices for the SDHC controllers

Gregory CLEMENT gregory.clement at bootlin.com
Fri Jul 23 05:57:51 PDT 2021


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 at 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



More information about the linux-arm-kernel mailing list