Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / exynos4412.dtsi

diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index 68ad43b391ae6122c3783b443cf23b5ccb7a2d04..b78ada70bd051d6ff3cc2bdd5cbb26859fd644eb 100644 (file)
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -54,19 +54,19 @@
                };
        };
 
-       combiner: interrupt-controller@10440000 {
-               samsung,combiner-nr = <20>;
-       };
-
        pmu {
                interrupts = <2 2>, <3 2>, <18 2>, <19 2>;
        };
+};
 
-       gic: interrupt-controller@10490000 {
-               cpu-offset = <0x4000>;
-       };
+&pmu_system_controller {
+       compatible = "samsung,exynos4412-pmu", "syscon";
+};
 
-       pmu_system_controller: system-controller@10020000 {
-               compatible = "samsung,exynos4412-pmu", "syscon";
-       };
+&combiner {
+       samsung,combiner-nr = <20>;
+};
+
+&gic {
+       cpu-offset = <0x4000>;
 };