From 92b80225b8322a51ab9703b171d636e5ffd4c620 Mon Sep 17 00:00:00 2001
From: Dong Aisheng <b29396@freescale.com>
Date: Thu, 26 Jun 2014 17:39:15 +0800
Subject: ENGR00320355 dts: imx6: mmc index fixed by controller order

Make the linux mmc index to be fixed according to controller order.
This can make user easily to identify which mmcX corresponding to which
controller and kernel be able find the rootfs in a card plugged in a
specific slot persistently.

This is a eventually solution for finding mmc block devices correctly
for different cards on multi slots.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit d6aa7401f65fbe5458e5459526d84405fdf4d078)
---
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 -
 arch/arm/boot/dts/imx6qdl.dtsi         | 4 ++++
 arch/arm/boot/dts/imx6sl.dtsi          | 4 ++++
 arch/arm/boot/dts/imx6sx.dtsi          | 4 ++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 2adcbd38ca02..a96d8302661f 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -12,7 +12,6 @@
 
 / {
 	aliases {
-		mmc0 = &usdhc4;
 		mxcfb0 = &mxcfb1;
 		mxcfb1 = &mxcfb2;
 		mxcfb2 = &mxcfb3;
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 71342eb1b2b5..2e5793435189 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -23,6 +23,10 @@
 		gpio5 = &gpio6;
 		gpio6 = &gpio7;
 		ipu0 = &ipu1;
+		mmc0 = &usdhc1;
+		mmc1 = &usdhc2;
+		mmc2 = &usdhc3;
+		mmc3 = &usdhc4;
 		serial0 = &uart1;
 		serial1 = &uart2;
 		serial2 = &uart3;
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 412fd188c088..400c6be1a879 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -13,6 +13,10 @@
 
 / {
 	aliases {
+		mmc0 = &usdhc1;
+		mmc1 = &usdhc2;
+		mmc2 = &usdhc3;
+		mmc3 = &usdhc4;
 		serial0 = &uart1;
 		serial1 = &uart2;
 		serial2 = &uart3;
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 5f021a6a54e4..231c6afc6887 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -28,6 +28,10 @@
 		lcdif1 = &lcdif2;
 		csi0 = &csi1;
 		csi1 = &csi2;
+		mmc0 = &usdhc1;
+		mmc1 = &usdhc2;
+		mmc2 = &usdhc3;
+		mmc3 = &usdhc4;
 		serial0 = &uart1;
 		serial1 = &uart2;
 		serial2 = &uart3;
-- 
cgit v1.2.2