openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Krzysztof Kozlowski 2018-04-16 20:11:25 +02:00
parent 013fdd1ea0
commit a03e9dacb9
7 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm/boot/dts/exynos-syscon-restart.dtsi
View File

@ -3,22 +3,18 @@
* Samsung's Exynos SoC syscon reboot/poweroff nodes common definition.
*/
/ {
soc {
compatible = "simple-bus";
&pmu_system_controller {
poweroff: syscon-poweroff {
compatible = "syscon-poweroff";
regmap = <&pmu_system_controller>;
offset = <0x330C>; /* PS_HOLD_CONTROL */
mask = <0x5200>; /* reset value */
};
poweroff: syscon-poweroff {
compatible = "syscon-poweroff";
regmap = <&pmu_system_controller>;
offset = <0x330C>; /* PS_HOLD_CONTROL */
mask = <0x5200>; /* reset value */
};
reboot: syscon-reboot {
compatible = "syscon-reboot";
regmap = <&pmu_system_controller>;
offset = <0x0400>; /* SWRESET */
mask = <0x1>;
};
reboot: syscon-reboot {
compatible = "syscon-reboot";
regmap = <&pmu_system_controller>;
offset = <0x0400>; /* SWRESET */
mask = <0x1>;
};
};

2
arch/arm/boot/dts/exynos3250.dtsi
View File

@ -15,7 +15,6 @@
*/
#include "exynos4-cpu-thermal.dtsi"
#include "exynos-syscon-restart.dtsi"
#include <dt-bindings/clock/exynos3250.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/interrupt-controller/irq.h>
@ -919,3 +918,4 @@ opp-100000000 {
};
#include "exynos3250-pinctrl.dtsi"
#include "exynos-syscon-restart.dtsi"

3
arch/arm/boot/dts/exynos4.dtsi
View File

@ -20,7 +20,6 @@
#include <dt-bindings/clock/exynos-audss-clk.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include "exynos-syscon-restart.dtsi"
/ {
interrupt-parent = <&gic>;
@ -1025,3 +1024,5 @@ prng: rng@10830400 {
};
};
};
#include "exynos-syscon-restart.dtsi"

1
arch/arm/boot/dts/exynos5.dtsi
View File

@ -12,7 +12,6 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include "exynos-syscon-restart.dtsi"
/ {
interrupt-parent = <&gic>;

1
arch/arm/boot/dts/exynos5250.dtsi
View File

@ -1113,3 +1113,4 @@ &trng {
};
#include "exynos5250-pinctrl.dtsi"
#include "exynos-syscon-restart.dtsi"

1
arch/arm/boot/dts/exynos5410.dtsi
View File

@ -439,3 +439,4 @@ &watchdog {
};
#include "exynos5410-pinctrl.dtsi"
#include "exynos-syscon-restart.dtsi"

1
arch/arm/boot/dts/exynos5420.dtsi
View File

@ -1517,3 +1517,4 @@ &watchdog {
};
#include "exynos5420-pinctrl.dtsi"
#include "exynos-syscon-restart.dtsi"