Commit da926e81 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Geert Uytterhoeven
Browse files

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: 7320915c ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.14")
Fixes: 21b2cec6 ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.4")
Signed-off-by: default avatarYoshihiro 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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent 3ebf49c0

arch/arm/boot/dts/r8a7790-lager.dts

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ aliases { 
		i2c11 = &i2cexio1;

		i2c12 = &i2chdmi;

		i2c13 = &i2cpwr;

		mmc0 = &mmcif1;

		mmc1 = &sdhi0;

		mmc2 = &sdhi2;

	};



	chosen {

arch/arm/boot/dts/r8a7791-koelsch.dts

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ aliases { 
		i2c12 = &i2cexio1;

		i2c13 = &i2chdmi;

		i2c14 = &i2cexio4;

		mmc0 = &sdhi0;

		mmc1 = &sdhi1;

		mmc2 = &sdhi2;

	};



	chosen {

arch/arm/boot/dts/r8a7791-porter.dts

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ aliases { 
		serial0 = &scif0;

		i2c9 = &gpioi2c2;

		i2c10 = &i2chdmi;

		mmc0 = &sdhi0;

		mmc1 = &sdhi2;

	};



	chosen {

arch/arm/boot/dts/r8a7793-gose.dts

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ aliases { 
		i2c10 = &gpioi2c4;

		i2c11 = &i2chdmi;

		i2c12 = &i2cexio4;

		mmc0 = &sdhi0;

		mmc1 = &sdhi1;

		mmc2 = &sdhi2;

	};



	chosen {

arch/arm/boot/dts/r8a7794-alt.dts

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ aliases { 
		i2c10 = &gpioi2c4;

		i2c11 = &i2chdmi;

		i2c12 = &i2cexio4;

		mmc0 = &mmcif0;

		mmc1 = &sdhi0;

		mmc2 = &sdhi1;

	};



	chosen {