Commit d765a4f3 authored Mar 01, 2021 by Yoshihiro Shimoda Committed by Geert Uytterhoeven Mar 08, 2021

arm64: dts: renesas: Add mmc aliases into board dts files

After the commit 7320915c ("mmc: Set PROBE_PREFER_ASYNCHRONOUS
for drivers that existed in v4.14"), the order of /dev/mmcblkN
was not fixed in some SoCs which have multiple sdhi controllers.
So, we were hard to use an sdhi 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 Renesas
arm64 board dts files. Notes that mmc0 is an eMMC channel if
available.

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



Fixes: 7320915c ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.14")
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/1614596786-22326-1-git-send-email-yoshihiro.shimoda.uh@renesas.com


Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

parent e8ae8db1

arch/arm64/boot/dts/renesas/hihope-common.dtsi

+3 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,9 @@ / {
		aliases {
		serial0 = &scif2;
		serial1 = &hscif0;
		mmc0 = &sdhi3;
		mmc1 = &sdhi0;
		mmc2 = &sdhi2;
		};

		chosen {

arch/arm64/boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts

+3 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,9 @@ aliases {
		serial4 = &hscif2;
		serial5 = &scif5;
		ethernet0 = &avb;
		mmc0 = &sdhi3;
		mmc1 = &sdhi0;
		mmc2 = &sdhi2;
		};

		chosen {

arch/arm64/boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dts

+3 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,9 @@ aliases {
		serial5 = &scif5;
		serial6 = &scif4;
		ethernet0 = &avb;
		mmc0 = &sdhi3;
		mmc1 = &sdhi0;
		mmc2 = &sdhi2;
		};

		chosen {

arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@ / {
		aliases {
		serial0 = &scif2;
		serial1 = &hscif2;
		mmc0 = &sdhi0;
		mmc1 = &sdhi3;
		};

		chosen {

arch/arm64/boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dts

+3 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,9 @@ aliases {
		serial5 = &scif5;
		serial6 = &scif4;
		ethernet0 = &avb;
		mmc0 = &sdhi3;
		mmc1 = &sdhi0;
		mmc2 = &sdhi2;
		};

		chosen {