]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
arm64: dts: armada-3720-turris-mox: fixed indices for the SDHC controllers
authorVladimir Oltean <vladimir.oltean@nxp.com>
Thu, 22 Jul 2021 10:11:34 +0000 (13:11 +0300)
committerGregory CLEMENT <gregory.clement@bootlin.com>
Fri, 23 Jul 2021 10:09:59 +0000 (12:09 +0200)
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>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts

index ce2bcddf396f8a2efe7b162c30e1baefad9cb45e..f2d7d6f071bce5e7b69629f25acc8039613adc13 100644 (file)
@@ -19,6 +19,8 @@
        aliases {
                spi0 = &spi0;
                ethernet1 = &eth1;
+               mmc0 = &sdhci0;
+               mmc1 = &sdhci1;
        };
 
        chosen {