ARM: dts: Move the dwmmc aliases from smdk5250 dts to exynos
authorDoug Anderson <dianders@chromium.org>
Wed, 21 Nov 2012 04:31:32 +0000 (13:31 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Wed, 21 Nov 2012 04:31:32 +0000 (13:31 +0900)
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>
arch/arm/boot/dts/exynos5250-smdk5250.dts
arch/arm/boot/dts/exynos5250.dtsi

index 3f8c2ab1d0388c11ae481b49a5dfefb93c320991..371182fc2c5070e55d8edbd65e409abda154d7af 100644 (file)
        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;
                };
        };
 
-       dwmmc_1: dwmmc1@12210000 {
+       dwmmc1@12210000 {
                status = "disabled";
        };
 
-       dwmmc_2: dwmmc2@12220000 {
+       dwmmc2@12220000 {
                num-slots = <1>;
                supports-highspeed;
                fifo-depth = <0x80>;
                };
        };
 
-       dwmmc_3: dwmmc3@12230000 {
+       dwmmc3@12230000 {
                status = "disabled";
        };
 
index e913525a48142945b1a2220edbf0d78bfc6f9d43..71a3e0b45444e06827bc568e66e77ffeafb4530a 100644 (file)
                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 {
                #size-cells = <0>;
        };
 
-       dwmmc0@12200000 {
+       dwmmc_0: dwmmc0@12200000 {
                compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12200000 0x1000>;
                interrupts = <0 75 0>;
                #size-cells = <0>;
        };
 
-       dwmmc1@12210000 {
+       dwmmc_1: dwmmc1@12210000 {
                compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12210000 0x1000>;
                interrupts = <0 76 0>;
                #size-cells = <0>;
        };
 
-       dwmmc2@12220000 {
+       dwmmc_2: dwmmc2@12220000 {
                compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12220000 0x1000>;
                interrupts = <0 77 0>;
                #size-cells = <0>;
        };
 
-       dwmmc3@12230000 {
+       dwmmc_3: dwmmc3@12230000 {
                compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12230000 0x1000>;
                interrupts = <0 78 0>;