ARM: dts: Move the dwmmc aliases from smdk5250 dts to exynos

The aliases for dwmmc were placed in the SMDK5250 dts file but really
should be common for all exynos5250 boards.  Move it to the common CPU
file.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 3f8c2ab..371182f 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -17,10 +17,6 @@
        compatible = "samsung,smdk5250", "samsung,exynos5250";
 
        aliases {
-               mshc0 = &dwmmc_0;
-               mshc1 = &dwmmc_1;
-               mshc2 = &dwmmc_2;
-               mshc3 = &dwmmc_3;
        };
 
        memory {
@@ -94,7 +90,7 @@
                status = "disabled";
        };
 
-       dwmmc_0: dwmmc0@12200000 {
+       dwmmc0@12200000 {
                num-slots = <1>;
                supports-highspeed;
                broken-cd;
@@ -115,11 +111,11 @@
                };
        };
 
-       dwmmc_1: dwmmc1@12210000 {
+       dwmmc1@12210000 {
                status = "disabled";
        };
 
-       dwmmc_2: dwmmc2@12220000 {
+       dwmmc2@12220000 {
                num-slots = <1>;
                supports-highspeed;
                fifo-depth = <0x80>;
@@ -140,7 +136,7 @@
                };
        };
 
-       dwmmc_3: dwmmc3@12230000 {
+       dwmmc3@12230000 {
                status = "disabled";
        };
 

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index e913525..71a3e0b 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -31,6 +31,10 @@
                gsc1 = &gsc_1;
                gsc2 = &gsc_2;
                gsc3 = &gsc_3;
+               mshc0 = &dwmmc_0;
+               mshc1 = &dwmmc_1;
+               mshc2 = &dwmmc_2;
+               mshc3 = &dwmmc_3;
        };
 
        gic:interrupt-controller@10481000 {
@@ -216,7 +220,7 @@
                #size-cells = <0>;
        };
 
-       dwmmc0@12200000 {
+       dwmmc_0: dwmmc0@12200000 {
                compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12200000 0x1000>;
                interrupts = <0 75 0>;
@@ -224,7 +228,7 @@
                #size-cells = <0>;
        };
 
-       dwmmc1@12210000 {
+       dwmmc_1: dwmmc1@12210000 {
                compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12210000 0x1000>;
                interrupts = <0 76 0>;
@@ -232,7 +236,7 @@
                #size-cells = <0>;
        };
 
-       dwmmc2@12220000 {
+       dwmmc_2: dwmmc2@12220000 {
                compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12220000 0x1000>;
                interrupts = <0 77 0>;
@@ -240,7 +244,7 @@
                #size-cells = <0>;
        };
 
-       dwmmc3@12230000 {
+       dwmmc_3: dwmmc3@12230000 {
                compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12230000 0x1000>;
                interrupts = <0 78 0>;