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

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>

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 26cada66854a51cd9d35d1f9d8f78df20e8e215f..2dad0742d2ba159bec8f38181d8c66d2235441ba 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 facd703e8336bd5c72086bccd263b5c41bc7c80b..e4dbf464c960fb958f8f7e61bb3ebe437cc92579 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 d4fe360d725ad7208db488146a3eb848aed107cf..c6ef636965c16f39b9290e9051c9ecf5165f11fa 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 45d85505ad717c764f60b4bb4e27aaa2ac520ff9..87fa57a99399b73d575103cfe670f2240a760a78 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 2185c6f383144ffd5d644bf2ae2dae51a2379613..f9dba5688d3ffd18b623c3be04a7485e4ecc07f3 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 9c019b8803c2975b4680fd2a1f66d11c26c4921b..eb89a27a6ed0c9aa1002d66c79dd4fa2b4dd35cc 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 {