Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a03e9dac authored Apr 16, 2018 by 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: Krzysztof Kozlowski <krzk@kernel.org>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>

parent 013fdd1e

arch/arm/boot/dts/exynos-syscon-restart.dtsi

+12 −16

Original line number	Original line	Diff line number	Diff line
	@@ -3,10 +3,7 @@
	* Samsung's Exynos SoC syscon reboot/poweroff nodes common definition.		* Samsung's Exynos SoC syscon reboot/poweroff nodes common definition.
	*/		*/

	/ {		&pmu_system_controller {
	soc {
	compatible = "simple-bus";

	poweroff: syscon-poweroff {		poweroff: syscon-poweroff {
	compatible = "syscon-poweroff";		compatible = "syscon-poweroff";
	regmap = <&pmu_system_controller>;		regmap = <&pmu_system_controller>;
	@@ -21,4 +18,3 @@
	mask = <0x1>;		mask = <0x1>;
	};		};
	};		};
	};

arch/arm/boot/dts/exynos3250.dtsi

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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 @@
	};		};

	#include "exynos3250-pinctrl.dtsi"		#include "exynos3250-pinctrl.dtsi"
			#include "exynos-syscon-restart.dtsi"

arch/arm/boot/dts/exynos4.dtsi

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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 @@
	};		};
	};		};
	};		};

			#include "exynos-syscon-restart.dtsi"

arch/arm/boot/dts/exynos5.dtsi

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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>;

arch/arm/boot/dts/exynos5250.dtsi

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1113,3 +1113,4 @@
	};		};

	#include "exynos5250-pinctrl.dtsi"		#include "exynos5250-pinctrl.dtsi"
			#include "exynos-syscon-restart.dtsi"