Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: 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>

+18 -19
+12 -16
arch/arm/boot/dts/exynos-syscon-restart.dtsi
··· 3 3 * Samsung's Exynos SoC syscon reboot/poweroff nodes common definition. 4 4 */ 5 5 6 - / { 7 - soc { 8 - compatible = "simple-bus"; 6 + &pmu_system_controller { 7 + poweroff: syscon-poweroff { 8 + compatible = "syscon-poweroff"; 9 + regmap = <&pmu_system_controller>; 10 + offset = <0x330C>; /* PS_HOLD_CONTROL */ 11 + mask = <0x5200>; /* reset value */ 12 + }; 9 13 10 - poweroff: syscon-poweroff { 11 - compatible = "syscon-poweroff"; 12 - regmap = <&pmu_system_controller>; 13 - offset = <0x330C>; /* PS_HOLD_CONTROL */ 14 - mask = <0x5200>; /* reset value */ 15 - }; 16 - 17 - reboot: syscon-reboot { 18 - compatible = "syscon-reboot"; 19 - regmap = <&pmu_system_controller>; 20 - offset = <0x0400>; /* SWRESET */ 21 - mask = <0x1>; 22 - }; 14 + reboot: syscon-reboot { 15 + compatible = "syscon-reboot"; 16 + regmap = <&pmu_system_controller>; 17 + offset = <0x0400>; /* SWRESET */ 18 + mask = <0x1>; 23 19 }; 24 20 };
+1 -1
arch/arm/boot/dts/exynos3250.dtsi
··· 15 15 */ 16 16 17 17 #include "exynos4-cpu-thermal.dtsi" 18 - #include "exynos-syscon-restart.dtsi" 19 18 #include <dt-bindings/clock/exynos3250.h> 20 19 #include <dt-bindings/interrupt-controller/arm-gic.h> 21 20 #include <dt-bindings/interrupt-controller/irq.h> ··· 918 919 }; 919 920 920 921 #include "exynos3250-pinctrl.dtsi" 922 + #include "exynos-syscon-restart.dtsi"
+2 -1
arch/arm/boot/dts/exynos4.dtsi
··· 20 20 #include <dt-bindings/clock/exynos-audss-clk.h> 21 21 #include <dt-bindings/interrupt-controller/arm-gic.h> 22 22 #include <dt-bindings/interrupt-controller/irq.h> 23 - #include "exynos-syscon-restart.dtsi" 24 23 25 24 / { 26 25 interrupt-parent = <&gic>; ··· 1024 1025 }; 1025 1026 }; 1026 1027 }; 1028 + 1029 + #include "exynos-syscon-restart.dtsi"
-1
arch/arm/boot/dts/exynos5.dtsi
··· 12 12 13 13 #include <dt-bindings/interrupt-controller/arm-gic.h> 14 14 #include <dt-bindings/interrupt-controller/irq.h> 15 - #include "exynos-syscon-restart.dtsi" 16 15 17 16 / { 18 17 interrupt-parent = <&gic>;
+1
arch/arm/boot/dts/exynos5250.dtsi
··· 1113 1113 }; 1114 1114 1115 1115 #include "exynos5250-pinctrl.dtsi" 1116 + #include "exynos-syscon-restart.dtsi"
+1
arch/arm/boot/dts/exynos5410.dtsi
··· 439 439 }; 440 440 441 441 #include "exynos5410-pinctrl.dtsi" 442 + #include "exynos-syscon-restart.dtsi"
+1
arch/arm/boot/dts/exynos5420.dtsi
··· 1517 1517 }; 1518 1518 1519 1519 #include "exynos5420-pinctrl.dtsi" 1520 + #include "exynos-syscon-restart.dtsi"