arm64: dts: exynos: Move syscon poweroff and restart nodes under the PMU

The PMU node is the actual block responsible for power management,
including typical Exynos on/off/restart procedures.  Therefore the
syscon poweroff and restart nodes logically belong to it.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>

diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
index c0231d077fa61f83dd66a7d9cd5aeb7423c6f6ff..01e49159dd916f73399e4ebe28be6fedc40dfcc3 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
@@ -231,13 +231,6 @@
                cpu_on = <0xC4000003>;
        };
 
-       reboot: syscon-reboot {
-               compatible = "syscon-reboot";
-               regmap = <&pmu_system_controller>;
-               offset = <0x400>; /* SWRESET */
-               mask = <0x1>;
-       };
-
        soc: soc {
                compatible = "simple-bus";
                #address-cells = <1>;
@@ -799,6 +792,13 @@
                        #clock-cells = <1>;
                        clock-names = "clkout16";
                        clocks = <&xxti>;
+
+                       reboot: syscon-reboot {
+                               compatible = "syscon-reboot";
+                               regmap = <&pmu_system_controller>;
+                               offset = <0x400>; /* SWRESET */
+                               mask = <0x1>;
+                       };
                };
 
                gic: interrupt-controller@11001000 {

diff --git a/arch/arm64/boot/dts/exynos/exynos7.dtsi b/arch/arm64/boot/dts/exynos/exynos7.dtsi
index ad9dce6894ce816799481c5abc30a517cd9cc4ef..0b98d2334cad33657c25d05d07deb664123b45e4 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos7.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos7.dtsi
@@ -494,13 +494,13 @@
                pmu_system_controller: system-controller@105c0000 {
                        compatible = "samsung,exynos7-pmu", "syscon";
                        reg = <0x105c0000 0x5000>;
-               };
 
-               reboot: syscon-reboot {
-                       compatible = "syscon-reboot";
-                       regmap = <&pmu_system_controller>;
-                       offset = <0x0400>;
-                       mask = <0x1>;
+                       reboot: syscon-reboot {
+                               compatible = "syscon-reboot";
+                               regmap = <&pmu_system_controller>;
+                               offset = <0x0400>;
+                               mask = <0x1>;
+                       };
                };
 
                rtc: rtc@10590000 {