ARM: dts: renesas: Add mmc aliases into R-Car Gen2 board dts files

[ Upstream commit da926e813fc7f9f0912fa413981a1f5ba63a536d ]

After set PROBE_PREFER_ASYNCHRONOUS flag on the mmc host drivers,
the order of /dev/mmcblkN was not fixed in some SoCs which have
multiple SDHI and/or MMCIF controllers. So, we were hard to use
such a device as rootfs by using the kernel parameter like
"root=/dev/mmcblkNpM".

According to the discussion on a mainling list [1], we can add
mmc aliases to fix the issue. So, add such aliases into R-Car Gen2
board dts files. Note that, since R-Car Gen2 is even more complicated
about SDHI and/or MMCIF channels variations and they share pins,
add the aliases into board dts files instead of SoC dtsi files.

[1]
https://lore.kernel.org/linux-arm-kernel/CAPDyKFptyEQNJu8cqzMt2WRFZcwEdjDiytMBp96nkoZyprTgmA@mail.gmail.com/

Fixes: 7320915c8861 ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.14")
Fixes: 21b2cec61c04 ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.4")
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/1613131316-30994-1-git-send-email-yoshihiro.shimoda.uh@renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 09a152b9155754ac5ab7bbc95429a88582e62cf3..1d6f0c5d02e9a282ff3aaca38cfdf7999c022881 100644 (file)
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -53,6 +53,9 @@
                i2c11 = &i2cexio1;
                i2c12 = &i2chdmi;
                i2c13 = &i2cpwr;
+               mmc0 = &mmcif1;
+               mmc1 = &sdhi0;
+               mmc2 = &sdhi2;
        };
 
        chosen {

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index f603cba5441fcb9e03e0fc6984ee9d1ca44c5d2e..6af1727b826908d3338d66b40baaae13ea752952 100644 (file)
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -53,6 +53,9 @@
                i2c12 = &i2cexio1;
                i2c13 = &i2chdmi;
                i2c14 = &i2cexio4;
+               mmc0 = &sdhi0;
+               mmc1 = &sdhi1;
+               mmc2 = &sdhi2;
        };
 
        chosen {

diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
index c6d563fb7ec7c17ff41afcfde07b963c16ebddd7..bf51e29c793a3bff7539b8fcdefc401f5b9da87b 100644 (file)
--- a/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -28,6 +28,8 @@
                serial0 = &scif0;
                i2c9 = &gpioi2c2;
                i2c10 = &i2chdmi;
+               mmc0 = &sdhi0;
+               mmc1 = &sdhi2;
        };
 
        chosen {

diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts
index abf487e8fe0f366fed09b3b4778a3afed6ebf19d..2b59a0491350042314e02538434505f54280528d 100644 (file)
--- a/arch/arm/boot/dts/r8a7793-gose.dts
+++ b/arch/arm/boot/dts/r8a7793-gose.dts
@@ -49,6 +49,9 @@
                i2c10 = &gpioi2c4;
                i2c11 = &i2chdmi;
                i2c12 = &i2cexio4;
+               mmc0 = &sdhi0;
+               mmc1 = &sdhi1;
+               mmc2 = &sdhi2;
        };
 
        chosen {

diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index 3f1cc5bbf32979e84dc4d5b2f8df8b258478c789..32025986b3b9b586bd28cdbbf1e9e1b51a7ff3fa 100644 (file)
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -19,6 +19,9 @@
                i2c10 = &gpioi2c4;
                i2c11 = &i2chdmi;
                i2c12 = &i2cexio4;
+               mmc0 = &mmcif0;
+               mmc1 = &sdhi0;
+               mmc2 = &sdhi1;
        };
 
        chosen {

diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index 677596f6c9c9a7d9da31eb75254aed51e0baba04..af066ee5e27540a39fdf9946e45a25ce771d593a 100644 (file)
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -31,6 +31,8 @@
                serial0 = &scif2;
                i2c9 = &gpioi2c1;
                i2c10 = &i2chdmi;
+               mmc0 = &mmcif0;
+               mmc1 = &sdhi1;
        };
 
        chosen {