LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v3 1/2] ARM: dts: exynos: Move syscon poweroff and restart nodes under the PMU
@ 2018-04-16 18:11 Krzysztof Kozlowski
2018-04-16 18:11 ` [PATCH v3 2/2] arm64: " Krzysztof Kozlowski
2018-04-16 18:13 ` [PATCH v3 1/2] ARM: " Krzysztof Kozlowski
0 siblings, 2 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2018-04-16 18:11 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
Catalin Marinas, Will Deacon, devicetree, linux-arm-kernel,
linux-samsung-soc, linux-kernel
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>
---
Previously was "Fix missing missing reg warning for syscon restart
nodes" to fix DTC warnings like:
arch/arm/boot/dts/exynos4412-trats2.dtb: Warning (simple_bus_reg):
Node /soc/syscon-poweroff missing or empty reg/ranges property
arch/arm/boot/dts/exynos4412-trats2.dtb: Warning (simple_bus_reg):
Node /soc/syscon-reboot missing or empty reg/ranges property
but this warnings are gone in v4.17-rc1 since 9130ba884640
("scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987")
---
arch/arm/boot/dts/exynos-syscon-restart.dtsi | 28 ++++++++++++----------------
arch/arm/boot/dts/exynos3250.dtsi | 2 +-
arch/arm/boot/dts/exynos4.dtsi | 3 ++-
arch/arm/boot/dts/exynos5.dtsi | 1 -
arch/arm/boot/dts/exynos5250.dtsi | 1 +
arch/arm/boot/dts/exynos5410.dtsi | 1 +
arch/arm/boot/dts/exynos5420.dtsi | 1 +
7 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/arch/arm/boot/dts/exynos-syscon-restart.dtsi b/arch/arm/boot/dts/exynos-syscon-restart.dtsi
index 4b3dd0549a54..ecf416690a15 100644
--- a/arch/arm/boot/dts/exynos-syscon-restart.dtsi
+++ b/arch/arm/boot/dts/exynos-syscon-restart.dtsi
@@ -3,22 +3,18 @@
* Samsung's Exynos SoC syscon reboot/poweroff nodes common definition.
*/
-/ {
- soc {
- compatible = "simple-bus";
-
- poweroff: syscon-poweroff {
- compatible = "syscon-poweroff";
- regmap = <&pmu_system_controller>;
- offset = <0x330C>; /* PS_HOLD_CONTROL */
- mask = <0x5200>; /* reset value */
- };
+&pmu_system_controller {
+ 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>;
};
};
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index 0a5f989d963b..962af97c1883 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -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 @@
};
#include "exynos3250-pinctrl.dtsi"
+#include "exynos-syscon-restart.dtsi"
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 909a9f2bf5be..dfe41b698745 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -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 @@
};
};
};
+
+#include "exynos-syscon-restart.dtsi"
diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index f8d7de1144f1..359f49bdd4e2 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 45283a6c5eee..85bfa8909af3 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -1117,3 +1117,4 @@
};
#include "exynos5250-pinctrl.dtsi"
+#include "exynos-syscon-restart.dtsi"
diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi
index 55509c690328..20e789ea136f 100644
--- a/arch/arm/boot/dts/exynos5410.dtsi
+++ b/arch/arm/boot/dts/exynos5410.dtsi
@@ -439,3 +439,4 @@
};
#include "exynos5410-pinctrl.dtsi"
+#include "exynos-syscon-restart.dtsi"
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 2f3cb2a97f71..71e2b154a244 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -1531,3 +1531,4 @@
};
#include "exynos5420-pinctrl.dtsi"
+#include "exynos-syscon-restart.dtsi"
--
2.14.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v3 2/2] arm64: dts: exynos: Move syscon poweroff and restart nodes under the PMU
2018-04-16 18:11 [PATCH v3 1/2] ARM: dts: exynos: Move syscon poweroff and restart nodes under the PMU Krzysztof Kozlowski
@ 2018-04-16 18:11 ` Krzysztof Kozlowski
2018-04-16 18:14 ` Krzysztof Kozlowski
2018-04-16 18:13 ` [PATCH v3 1/2] ARM: " Krzysztof Kozlowski
1 sibling, 1 reply; 4+ messages in thread
From: Krzysztof Kozlowski @ 2018-04-16 18:11 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Krzysztof Kozlowski,
Catalin Marinas, Will Deacon, devicetree, linux-arm-kernel,
linux-samsung-soc, linux-kernel
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>
---
Previously was "Fix missing missing reg warning for syscon restart
nodes" to fix DTC warnings like:
arch/arm64/boot/dts/exynos/exynos7-espresso.dtb: Warning (simple_bus_reg):
Node /soc/syscon-reboot missing or empty reg/ranges property
but this warnings are gone in v4.17-rc1 since 9130ba884640
("scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987")
---
arch/arm64/boot/dts/exynos/exynos5433.dtsi | 14 +++++++-------
arch/arm64/boot/dts/exynos/exynos7.dtsi | 12 ++++++------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi
index c0231d077fa6..01e49159dd91 100644
--- 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 ad9dce6894ce..0b98d2334cad 100644
--- 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 {
--
2.14.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3 1/2] ARM: dts: exynos: Move syscon poweroff and restart nodes under the PMU
2018-04-16 18:11 [PATCH v3 1/2] ARM: dts: exynos: Move syscon poweroff and restart nodes under the PMU Krzysztof Kozlowski
2018-04-16 18:11 ` [PATCH v3 2/2] arm64: " Krzysztof Kozlowski
@ 2018-04-16 18:13 ` Krzysztof Kozlowski
1 sibling, 0 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2018-04-16 18:13 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Catalin Marinas,
Will Deacon, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel
On Mon, Apr 16, 2018 at 08:11:25PM +0200, Krzysztof Kozlowski wrote:
> 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>
>
> ---
>
> Previously was "Fix missing missing reg warning for syscon restart
> nodes" to fix DTC warnings like:
>
> arch/arm/boot/dts/exynos4412-trats2.dtb: Warning (simple_bus_reg):
> Node /soc/syscon-poweroff missing or empty reg/ranges property
> arch/arm/boot/dts/exynos4412-trats2.dtb: Warning (simple_bus_reg):
> Node /soc/syscon-reboot missing or empty reg/ranges property
>
> but this warnings are gone in v4.17-rc1 since 9130ba884640
> ("scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987")
> ---
> arch/arm/boot/dts/exynos-syscon-restart.dtsi | 28 ++++++++++++----------------
> arch/arm/boot/dts/exynos3250.dtsi | 2 +-
> arch/arm/boot/dts/exynos4.dtsi | 3 ++-
> arch/arm/boot/dts/exynos5.dtsi | 1 -
> arch/arm/boot/dts/exynos5250.dtsi | 1 +
> arch/arm/boot/dts/exynos5410.dtsi | 1 +
> arch/arm/boot/dts/exynos5420.dtsi | 1 +
> 7 files changed, 18 insertions(+), 19 deletions(-)
I forgot to include Marek's tested-by tag (given previously):
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v3 2/2] arm64: dts: exynos: Move syscon poweroff and restart nodes under the PMU
2018-04-16 18:11 ` [PATCH v3 2/2] arm64: " Krzysztof Kozlowski
@ 2018-04-16 18:14 ` Krzysztof Kozlowski
0 siblings, 0 replies; 4+ messages in thread
From: Krzysztof Kozlowski @ 2018-04-16 18:14 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Kukjin Kim, Catalin Marinas,
Will Deacon, devicetree, linux-arm-kernel, linux-samsung-soc,
linux-kernel
On Mon, Apr 16, 2018 at 08:11:26PM +0200, Krzysztof Kozlowski wrote:
> 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>
>
> ---
>
> Previously was "Fix missing missing reg warning for syscon restart
> nodes" to fix DTC warnings like:
>
> arch/arm64/boot/dts/exynos/exynos7-espresso.dtb: Warning (simple_bus_reg):
> Node /soc/syscon-reboot missing or empty reg/ranges property
>
> but this warnings are gone in v4.17-rc1 since 9130ba884640
> ("scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987")
> ---
> arch/arm64/boot/dts/exynos/exynos5433.dtsi | 14 +++++++-------
> arch/arm64/boot/dts/exynos/exynos7.dtsi | 12 ++++++------
> 2 files changed, 13 insertions(+), 13 deletions(-)
I forgot to include Marek's tested-by tag (given previously):
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-04-16 18:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-16 18:11 [PATCH v3 1/2] ARM: dts: exynos: Move syscon poweroff and restart nodes under the PMU Krzysztof Kozlowski
2018-04-16 18:11 ` [PATCH v3 2/2] arm64: " Krzysztof Kozlowski
2018-04-16 18:14 ` Krzysztof Kozlowski
2018-04-16 18:13 ` [PATCH v3 1/2] ARM: " Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).