| From fc47c77f984355fcac5234e7de207e89f1946471 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 12 Feb 2021 21:01:56 +0900 |
| Subject: ARM: dts: renesas: Add mmc aliases into R-Car Gen2 board dts files |
| |
| From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| |
| [ 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> |
| --- |
| arch/arm/boot/dts/r8a7790-lager.dts | 3 +++ |
| arch/arm/boot/dts/r8a7791-koelsch.dts | 3 +++ |
| arch/arm/boot/dts/r8a7791-porter.dts | 2 ++ |
| arch/arm/boot/dts/r8a7793-gose.dts | 3 +++ |
| arch/arm/boot/dts/r8a7794-alt.dts | 3 +++ |
| arch/arm/boot/dts/r8a7794-silk.dts | 2 ++ |
| 6 files changed, 16 insertions(+) |
| |
| diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts |
| index 09a152b91557..1d6f0c5d02e9 100644 |
| --- 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 f603cba5441f..6af1727b8269 100644 |
| --- 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 c6d563fb7ec7..bf51e29c793a 100644 |
| --- 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 abf487e8fe0f..2b59a0491350 100644 |
| --- 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 3f1cc5bbf329..32025986b3b9 100644 |
| --- 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 677596f6c9c9..af066ee5e275 100644 |
| --- 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 { |
| -- |
| 2.30.2 |
| |