ARM: dts: exynos: replace mshc0 alias with mmc-ddr-1_8v property

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos5420.dtsi

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 13d7be2..dd291f1 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -19,9 +19,6 @@
        compatible = "samsung,exynos5420", "samsung,exynos5";
 
        aliases {
-               mshc0 = &mmc_0;
-               mshc1 = &mmc_1;
-               mshc2 = &mmc_2;
                pinctrl0 = &pinctrl_0;
                pinctrl1 = &pinctrl_1;
                pinctrl2 = &pinctrl_2;
@@ -696,18 +693,6 @@
                        status = "disabled";
                };
 
-               dp_phy: dp-video-phy {
-                       compatible = "samsung,exynos5420-dp-video-phy";
-                       samsung,pmu-syscon = <&pmu_system_controller>;
-                       #phy-cells = <0>;
-               };
-
-               mipi_phy: mipi-video-phy {
-                       compatible = "samsung,exynos5420-mipi-video-phy";
-                       syscon = <&pmu_system_controller>;
-                       #phy-cells = <1>;
-               };
-
                dsi: dsi@14500000 {
                        compatible = "samsung,exynos5410-mipi-dsi";
                        reg = <0x14500000 0x10000>;
@@ -933,7 +918,7 @@
                };
 
                pmu_system_controller: system-controller@10040000 {
-                       compatible = "samsung,exynos5420-pmu", "syscon";
+                       compatible = "samsung,exynos5420-pmu", "simple-mfd", "syscon";
                        reg = <0x10040000 0x5000>;
                        clock-names = "clkout16";
                        clocks = <&clock CLK_FIN_PLL>;
@@ -941,6 +926,16 @@
                        interrupt-controller;
                        #interrupt-cells = <3>;
                        interrupt-parent = <&gic>;
+
+                       dp_phy: dp-phy {
+                               compatible = "samsung,exynos5420-dp-video-phy";
+                               #phy-cells = <0>;
+                       };
+
+                       mipi_phy: mipi-phy {
+                               compatible = "samsung,exynos5420-mipi-video-phy";
+                               #phy-cells = <1>;
+                       };
                };
 
                tmu_cpu0: tmu@10060000 {