[PATCH 4/5] arm: dts: exynos: Use common alias for Odroid U3/X2 MMC2 (SD-card)

Use MMC0 for eMMC and MMC2 for SD-card as other Exynos-based boards do.
This allows to use common code to get MMC device id based on the XOM[7:5]
pins.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Anand Moon <linux.amoon@gmail.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Gbp-Pq: Topic exynos
Gbp-Pq: Name 0006-arm-dts-exynos-Use-common-alias-for-Odroid-U3-X2-MMC.patch

diff --git a/arch/arm/dts/exynos4412-odroid.dts b/arch/arm/dts/exynos4412-odroid.dts
index e6c7222755923b80585298c884a43463f058f9c4..ce08e8dc1ebb1b10911fdace90365229dbb29094 100644 (file)
--- a/arch/arm/dts/exynos4412-odroid.dts
+++ b/arch/arm/dts/exynos4412-odroid.dts
@@ -17,7 +17,7 @@
                serial0 = "/serial@13800000";
                console = "/serial@13810000";
                mmc0 = &mshc_0;
-               mmc1 = &sdhci2;
+               mmc2 = &sdhci2;
        };
 
        serial@13810000 {

diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 9f7bbbe8ed3c3f567b126989018166fff89df539..c29ba047395a4d822f45b73a12d3330f6bc65477 100644 (file)
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -80,7 +80,7 @@
        "tzsw raw 0x83f 0x138\0"
 
 #define BOOT_TARGET_DEVICES(func) \
-       func(MMC, mmc, 1) \
+       func(MMC, mmc, 2) \
        func(MMC, mmc, 0)
 
 #include <config_distro_bootcmd.h>