lkml.org 
[lkml]   [2021]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 013/135] arm64: dts: armada-3720-turris-mox: fixed indices for the SDHC controllers
    Date
    From: Vladimir Oltean <vladimir.oltean@nxp.com>

    [ Upstream commit 923f98929182dfd04e9149be839160b63a3db145 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 389aebdb35f1..2d51c6f3915d 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.30.2


    \
     
     \ /
      Last update: 2021-08-10 19:42    [W:4.086 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site