[PATCH AUTOSEL 4.4 1/7] ARM: dts: Fix swapped mmc order for omap3

[PATCH AUTOSEL 4.4 1/7] ARM: dts: Fix swapped mmc order for omap3

[Sasha Levin]

From: Tony Lindgren <tony@atomide.com>

[ Upstream commit a1ebdb3741993f853865d1bd8f77881916ad53a7 ]

Also some omap3 devices like n900 seem to have eMMC and micro-sd swapped
around with commit 21b2cec61c04 ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for
drivers that existed in v4.4").

Let's fix the issue with aliases as discussed on the mailing lists. While
the mmc aliases should be board specific, let's first fix the issue with
minimal changes.

Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 arch/arm/boot/dts/omap3.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 8a2b25332b8c..a2e41d79e829 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -22,6 +22,9 @@ aliases {
 		i2c0 = &i2c1;
 		i2c1 = &i2c2;
 		i2c2 = &i2c3;
+		mmc0 = &mmc1;
+		mmc1 = &mmc2;
+		mmc2 = &mmc3;
 		serial0 = &uart1;
 		serial1 = &uart2;
 		serial2 = &uart3;
-- 
2.30.2

Re: [PATCH AUTOSEL 4.4 1/7] ARM: dts: Fix swapped mmc order for omap3

[Pavel Machek]

[-- Attachment #1: Type: text/plain, Size: 1033 bytes --]

Hi!

> From: Tony Lindgren <tony@atomide.com>
> 
> [ Upstream commit a1ebdb3741993f853865d1bd8f77881916ad53a7 ]
> 
> Also some omap3 devices like n900 seem to have eMMC and micro-sd swapped
> around with commit 21b2cec61c04 ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for
> drivers that existed in v4.4").
> 
> Let's fix the issue with aliases as discussed on the mailing lists. While
> the mmc aliases should be board specific, let's first fix the issue with
> minimal changes.

21b2cec61c04 tries to make newer kernels compatible with 4.4, and this
is fixup for 21b2cec61c04. 21b2cec61c04 is not in 4.4 (obviously) so i
don't believe we need this for 4.4.

As this claims to "making it compatible with 4.4", I believe we should
leave 4.4 alone.

21b2cec61c04 is not present in v4.19, either, but what needs to be
done there is less clear.

21b2cec61c04 is in v5.10, so a1ebdb3741993f853865d1bd8f77881916ad53a7
makes sense there, too.

Best regards,
								Pavel
-- 
http://www.livejournal.com/~pavelmachek

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]