Merge tag 'omap-for-v3.19/gic-regression-v2' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / arm / boot / dts / exynos5420.dtsi

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 90bf401..6d38f8b 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -120,7 +120,7 @@
                };
        };
 
-       cci@10d20000 {
+       cci: cci@10d20000 {
                compatible = "arm,cci-400";
                #address-cells = <1>;
                #size-cells = <1>;
@@ -503,8 +503,8 @@
        };
 
        dp_phy: video-phy@10040728 {
-               compatible = "samsung,exynos5250-dp-video-phy";
-               reg = <0x10040728 4>;
+               compatible = "samsung,exynos5420-dp-video-phy";
+               samsung,pmu-syscon = <&pmu_system_controller>;
                #phy-cells = <0>;
        };
 
@@ -541,12 +541,13 @@
 
        adc: adc@12D10000 {
                compatible = "samsung,exynos-adc-v2";
-               reg = <0x12D10000 0x100>, <0x10040720 0x4>;
+               reg = <0x12D10000 0x100>;
                interrupts = <0 106 0>;
                clocks = <&clock CLK_TSADC>;
                clock-names = "adc";
                #io-channel-cells = <1>;
                io-channel-ranges;
+               samsung,syscon-phandle = <&pmu_system_controller>;
                status = "disabled";
        };