Commit a03e9dac authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski

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: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
parent 013fdd1e
...@@ -3,22 +3,18 @@ ...@@ -3,22 +3,18 @@
* Samsung's Exynos SoC syscon reboot/poweroff nodes common definition. * Samsung's Exynos SoC syscon reboot/poweroff nodes common definition.
*/ */
/ { &pmu_system_controller {
soc { poweroff: syscon-poweroff {
compatible = "simple-bus"; compatible = "syscon-poweroff";
regmap = <&pmu_system_controller>;
poweroff: syscon-poweroff { offset = <0x330C>; /* PS_HOLD_CONTROL */
compatible = "syscon-poweroff"; mask = <0x5200>; /* reset value */
regmap = <&pmu_system_controller>; };
offset = <0x330C>; /* PS_HOLD_CONTROL */
mask = <0x5200>; /* reset value */
};
reboot: syscon-reboot { reboot: syscon-reboot {
compatible = "syscon-reboot"; compatible = "syscon-reboot";
regmap = <&pmu_system_controller>; regmap = <&pmu_system_controller>;
offset = <0x0400>; /* SWRESET */ offset = <0x0400>; /* SWRESET */
mask = <0x1>; mask = <0x1>;
};
}; };
}; };
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
*/ */
#include "exynos4-cpu-thermal.dtsi" #include "exynos4-cpu-thermal.dtsi"
#include "exynos-syscon-restart.dtsi"
#include <dt-bindings/clock/exynos3250.h> #include <dt-bindings/clock/exynos3250.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
...@@ -919,3 +918,4 @@ opp-100000000 { ...@@ -919,3 +918,4 @@ opp-100000000 {
}; };
#include "exynos3250-pinctrl.dtsi" #include "exynos3250-pinctrl.dtsi"
#include "exynos-syscon-restart.dtsi"
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <dt-bindings/clock/exynos-audss-clk.h> #include <dt-bindings/clock/exynos-audss-clk.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include "exynos-syscon-restart.dtsi"
/ { / {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
...@@ -1025,3 +1024,5 @@ prng: rng@10830400 { ...@@ -1025,3 +1024,5 @@ prng: rng@10830400 {
}; };
}; };
}; };
#include "exynos-syscon-restart.dtsi"
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include "exynos-syscon-restart.dtsi"
/ { / {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
......
...@@ -1113,3 +1113,4 @@ &trng { ...@@ -1113,3 +1113,4 @@ &trng {
}; };
#include "exynos5250-pinctrl.dtsi" #include "exynos5250-pinctrl.dtsi"
#include "exynos-syscon-restart.dtsi"
...@@ -439,3 +439,4 @@ &watchdog { ...@@ -439,3 +439,4 @@ &watchdog {
}; };
#include "exynos5410-pinctrl.dtsi" #include "exynos5410-pinctrl.dtsi"
#include "exynos-syscon-restart.dtsi"
...@@ -1517,3 +1517,4 @@ &watchdog { ...@@ -1517,3 +1517,4 @@ &watchdog {
}; };
#include "exynos5420-pinctrl.dtsi" #include "exynos5420-pinctrl.dtsi"
#include "exynos-syscon-restart.dtsi"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment