All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/5] arm64: renesas: Add R-Car S4-8 watchdog support on Spider
@ 2022-01-18 17:09 Geert Uytterhoeven
  2022-01-18 17:09 ` [PATCH 1/5] clk: renesas: r8a779f0: Add WDT clock Geert Uytterhoeven
                   ` (4 more replies)
  0 siblings, 5 replies; 17+ messages in thread
From: Geert Uytterhoeven @ 2022-01-18 17:09 UTC (permalink / raw)
  To: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Guenter Roeck,
	Rob Herring, Magnus Damm
  Cc: Wolfram Sang, LUU HOAI, linux-clk, devicetree, linux-watchdog,
	linux-renesas-soc, Geert Uytterhoeven

	Hi all,

This patch series adds support for the RCLK Watchdog Timer (RWDT) in the
R-Car S4-8 SoC, and enables it on the Renesas Spider development board.

Patch 1 is to be queued in renesas-clk for v5.18.
Patches 2 and 3 are intended for the watchdog tree.
Patches 4 and 5 are to be queued in renesas-devel for v5.18.

Thanks for your comments!

Geert Uytterhoeven (3):
  clk: renesas: r8a779f0: Add WDT clock
  arm64: dts: renesas: r8a779f0: Add RWDT node
  arm64: dts: renesas: spider-cpu: Enable watchdog timer

Thanh Quan (2):
  dt-bindings: watchdog: renesas-wdt: Document r8a779f0 support
  watchdog: renesas_wdt: Add R-Car Gen4 support

 .../devicetree/bindings/watchdog/renesas,wdt.yaml      |  5 +++++
 arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi   |  5 +++++
 arch/arm64/boot/dts/renesas/r8a779f0.dtsi              | 10 ++++++++++
 drivers/clk/renesas/r8a779f0-cpg-mssr.c                |  9 +++++++++
 drivers/watchdog/renesas_wdt.c                         |  1 +
 5 files changed, 30 insertions(+)

-- 
2.25.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH 1/5] clk: renesas: r8a779f0: Add WDT clock
  2022-01-18 17:09 [PATCH 0/5] arm64: renesas: Add R-Car S4-8 watchdog support on Spider Geert Uytterhoeven
@ 2022-01-18 17:09 ` Geert Uytterhoeven
  2022-02-08 12:38   ` Wolfram Sang
  2022-02-14 15:50   ` Guenter Roeck
  2022-01-18 17:09 ` [PATCH 2/5] dt-bindings: watchdog: renesas-wdt: Document r8a779f0 support Geert Uytterhoeven
                   ` (3 subsequent siblings)
  4 siblings, 2 replies; 17+ messages in thread
From: Geert Uytterhoeven @ 2022-01-18 17:09 UTC (permalink / raw)
  To: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Guenter Roeck,
	Rob Herring, Magnus Damm
  Cc: Wolfram Sang, LUU HOAI, linux-clk, devicetree, linux-watchdog,
	linux-renesas-soc, Geert Uytterhoeven

Add the module clock used by the RCLK Watchdog Timer (RWDT) on the
Renesas R-Car S4-8 (r8a779f0) SoC.  Mark it as a critical clock, to
ensure uninterrupted watchdog operation.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/clk/renesas/r8a779f0-cpg-mssr.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/clk/renesas/r8a779f0-cpg-mssr.c b/drivers/clk/renesas/r8a779f0-cpg-mssr.c
index 4100078406d67073..e48c5af7341454a7 100644
--- a/drivers/clk/renesas/r8a779f0-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a779f0-cpg-mssr.c
@@ -121,6 +121,11 @@ static const struct mssr_mod_clk r8a779f0_mod_clks[] __initconst = {
 	DEF_MOD("scif4",	705,	R8A779F0_CLK_S0D12_PER),
 	DEF_MOD("sys-dmac0",	709,	R8A779F0_CLK_S0D3_PER),
 	DEF_MOD("sys-dmac1",	710,	R8A779F0_CLK_S0D3_PER),
+	DEF_MOD("wdt",		907,	R8A779F0_CLK_R),
+};
+
+static const unsigned int r8a779f0_crit_mod_clks[] __initconst = {
+	MOD_CLK_ID(907),	/* WDT */
 };
 
 /*
@@ -177,6 +182,10 @@ const struct cpg_mssr_info r8a779f0_cpg_mssr_info __initconst = {
 	.num_mod_clks = ARRAY_SIZE(r8a779f0_mod_clks),
 	.num_hw_mod_clks = 28 * 32,
 
+	/* Critical Module Clocks */
+	.crit_mod_clks = r8a779f0_crit_mod_clks,
+	.num_crit_mod_clks = ARRAY_SIZE(r8a779f0_crit_mod_clks),
+
 	/* Callbacks */
 	.init = r8a779f0_cpg_mssr_init,
 	.cpg_clk_register = rcar_gen4_cpg_clk_register,
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 2/5] dt-bindings: watchdog: renesas-wdt: Document r8a779f0 support
  2022-01-18 17:09 [PATCH 0/5] arm64: renesas: Add R-Car S4-8 watchdog support on Spider Geert Uytterhoeven
  2022-01-18 17:09 ` [PATCH 1/5] clk: renesas: r8a779f0: Add WDT clock Geert Uytterhoeven
@ 2022-01-18 17:09 ` Geert Uytterhoeven
  2022-02-08 12:39   ` Wolfram Sang
                     ` (2 more replies)
  2022-01-18 17:09 ` [PATCH 3/5] watchdog: renesas_wdt: Add R-Car Gen4 support Geert Uytterhoeven
                   ` (2 subsequent siblings)
  4 siblings, 3 replies; 17+ messages in thread
From: Geert Uytterhoeven @ 2022-01-18 17:09 UTC (permalink / raw)
  To: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Guenter Roeck,
	Rob Herring, Magnus Damm
  Cc: Wolfram Sang, LUU HOAI, linux-clk, devicetree, linux-watchdog,
	linux-renesas-soc, Thanh Quan, Geert Uytterhoeven

From: Thanh Quan <thanh.quan.xn@renesas.com>

Document support for the Watchdog Timer (WDT) Controller in the Renesas
R-Car S4-8 (R8A779F0) SoC.

Signed-off-by: Thanh Quan <thanh.quan.xn@renesas.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
index 91a98ccd4226f505..d060438e1402d502 100644
--- a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
@@ -55,6 +55,11 @@ properties:
               - renesas,r8a779a0-wdt     # R-Car V3U
           - const: renesas,rcar-gen3-wdt # R-Car Gen3 and RZ/G2
 
+      - items:
+          - enum:
+              - renesas,r8a779f0-wdt     # R-Car S4-8
+          - const: renesas,rcar-gen4-wdt # R-Car Gen4
+
   reg:
     maxItems: 1
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 3/5] watchdog: renesas_wdt: Add R-Car Gen4 support
  2022-01-18 17:09 [PATCH 0/5] arm64: renesas: Add R-Car S4-8 watchdog support on Spider Geert Uytterhoeven
  2022-01-18 17:09 ` [PATCH 1/5] clk: renesas: r8a779f0: Add WDT clock Geert Uytterhoeven
  2022-01-18 17:09 ` [PATCH 2/5] dt-bindings: watchdog: renesas-wdt: Document r8a779f0 support Geert Uytterhoeven
@ 2022-01-18 17:09 ` Geert Uytterhoeven
  2022-02-08 12:41   ` Wolfram Sang
  2022-02-14 15:49   ` Guenter Roeck
  2022-01-18 17:09 ` [PATCH 4/5] arm64: dts: renesas: r8a779f0: Add RWDT node Geert Uytterhoeven
  2022-01-18 17:09 ` [PATCH 5/5] arm64: dts: renesas: spider-cpu: Enable watchdog timer Geert Uytterhoeven
  4 siblings, 2 replies; 17+ messages in thread
From: Geert Uytterhoeven @ 2022-01-18 17:09 UTC (permalink / raw)
  To: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Guenter Roeck,
	Rob Herring, Magnus Damm
  Cc: Wolfram Sang, LUU HOAI, linux-clk, devicetree, linux-watchdog,
	linux-renesas-soc, Thanh Quan, Geert Uytterhoeven

From: Thanh Quan <thanh.quan.xn@renesas.com>

Add the compatible string for the R-Car Gen4 family.
No further driver changes are needed.

Signed-off-by: Thanh Quan <thanh.quan.xn@renesas.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/watchdog/renesas_wdt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c
index 5791198960e6c5bf..41d58ea5eb2f40fd 100644
--- a/drivers/watchdog/renesas_wdt.c
+++ b/drivers/watchdog/renesas_wdt.c
@@ -327,6 +327,7 @@ static SIMPLE_DEV_PM_OPS(rwdt_pm_ops, rwdt_suspend, rwdt_resume);
 static const struct of_device_id rwdt_ids[] = {
 	{ .compatible = "renesas,rcar-gen2-wdt", },
 	{ .compatible = "renesas,rcar-gen3-wdt", },
+	{ .compatible = "renesas,rcar-gen4-wdt", },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, rwdt_ids);
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 4/5] arm64: dts: renesas: r8a779f0: Add RWDT node
  2022-01-18 17:09 [PATCH 0/5] arm64: renesas: Add R-Car S4-8 watchdog support on Spider Geert Uytterhoeven
                   ` (2 preceding siblings ...)
  2022-01-18 17:09 ` [PATCH 3/5] watchdog: renesas_wdt: Add R-Car Gen4 support Geert Uytterhoeven
@ 2022-01-18 17:09 ` Geert Uytterhoeven
  2022-02-08 12:42   ` Wolfram Sang
  2022-02-14 15:51   ` Guenter Roeck
  2022-01-18 17:09 ` [PATCH 5/5] arm64: dts: renesas: spider-cpu: Enable watchdog timer Geert Uytterhoeven
  4 siblings, 2 replies; 17+ messages in thread
From: Geert Uytterhoeven @ 2022-01-18 17:09 UTC (permalink / raw)
  To: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Guenter Roeck,
	Rob Herring, Magnus Damm
  Cc: Wolfram Sang, LUU HOAI, linux-clk, devicetree, linux-watchdog,
	linux-renesas-soc, Geert Uytterhoeven

Add a device node for the RCLK Watchdog Timer (RWDT) on the Renesas
R-Car S4-8 (R8A779F0) SoC.

Extracted from a larger patch in the BSP by LUU HOAI.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a779f0.dtsi b/arch/arm64/boot/dts/renesas/r8a779f0.dtsi
index 5426532d10e2a472..0ac8c345558efc17 100644
--- a/arch/arm64/boot/dts/renesas/r8a779f0.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779f0.dtsi
@@ -59,6 +59,16 @@ soc: soc {
 		#size-cells = <2>;
 		ranges;
 
+		rwdt: watchdog@e6020000 {
+			compatible = "renesas,r8a779f0-wdt",
+				     "renesas,rcar-gen4-wdt";
+			reg = <0 0xe6020000 0 0x0c>;
+			clocks = <&cpg CPG_MOD 907>;
+			power-domains = <&sysc R8A779F0_PD_ALWAYS_ON>;
+			resets = <&cpg 907>;
+			status = "disabled";
+		};
+
 		cpg: clock-controller@e6150000 {
 			compatible = "renesas,r8a779f0-cpg-mssr";
 			reg = <0 0xe6150000 0 0x4000>;
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [PATCH 5/5] arm64: dts: renesas: spider-cpu: Enable watchdog timer
  2022-01-18 17:09 [PATCH 0/5] arm64: renesas: Add R-Car S4-8 watchdog support on Spider Geert Uytterhoeven
                   ` (3 preceding siblings ...)
  2022-01-18 17:09 ` [PATCH 4/5] arm64: dts: renesas: r8a779f0: Add RWDT node Geert Uytterhoeven
@ 2022-01-18 17:09 ` Geert Uytterhoeven
  2022-02-08 12:42   ` Wolfram Sang
  2022-02-14 15:52   ` Guenter Roeck
  4 siblings, 2 replies; 17+ messages in thread
From: Geert Uytterhoeven @ 2022-01-18 17:09 UTC (permalink / raw)
  To: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Guenter Roeck,
	Rob Herring, Magnus Damm
  Cc: Wolfram Sang, LUU HOAI, linux-clk, devicetree, linux-watchdog,
	linux-renesas-soc, Geert Uytterhoeven

Enable the watchdog timer on the Spider board.

Extracted from a larger patch in the BSP by LUU HOAI.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
For the watchdog to be able to actually reboot the system, this depends
on proper configuration of the Watchdog Timer Reset Control Register
(WDTRSTCR) in the Reset (RST) module, either by Linux[1], or by the
firmware.

[1] "[PATCH LOCAL v2] soc: renesas: rcar-rst: Allow WDT reset on R-Car
     Gen4"
    https://lore.kernel.org/r/39005cf749a99afc6d3ba96ff155fd2a231418a8.1642524743.git.geert+renesas@glider.be
---
 arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi b/arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi
index 156586532c844c41..3a90932fe85c8243 100644
--- a/arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi
@@ -31,6 +31,11 @@ &extalr_clk {
 	clock-frequency = <32768>;
 };
 
+&rwdt {
+	timeout-sec = <60>;
+	status = "okay";
+};
+
 &scif3 {
 	status = "okay";
 };
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* Re: [PATCH 1/5] clk: renesas: r8a779f0: Add WDT clock
  2022-01-18 17:09 ` [PATCH 1/5] clk: renesas: r8a779f0: Add WDT clock Geert Uytterhoeven
@ 2022-02-08 12:38   ` Wolfram Sang
  2022-02-14 15:50   ` Guenter Roeck
  1 sibling, 0 replies; 17+ messages in thread
From: Wolfram Sang @ 2022-02-08 12:38 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Guenter Roeck,
	Rob Herring, Magnus Damm, LUU HOAI, linux-clk, devicetree,
	linux-watchdog, linux-renesas-soc

[-- Attachment #1: Type: text/plain, Size: 387 bytes --]

On Tue, Jan 18, 2022 at 06:09:01PM +0100, Geert Uytterhoeven wrote:
> Add the module clock used by the RCLK Watchdog Timer (RWDT) on the
> Renesas R-Car S4-8 (r8a779f0) SoC.  Mark it as a critical clock, to
> ensure uninterrupted watchdog operation.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 2/5] dt-bindings: watchdog: renesas-wdt: Document r8a779f0 support
  2022-01-18 17:09 ` [PATCH 2/5] dt-bindings: watchdog: renesas-wdt: Document r8a779f0 support Geert Uytterhoeven
@ 2022-02-08 12:39   ` Wolfram Sang
  2022-02-09  2:54   ` Rob Herring
  2022-02-14 15:48   ` Guenter Roeck
  2 siblings, 0 replies; 17+ messages in thread
From: Wolfram Sang @ 2022-02-08 12:39 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Guenter Roeck,
	Rob Herring, Magnus Damm, LUU HOAI, linux-clk, devicetree,
	linux-watchdog, linux-renesas-soc, Thanh Quan

[-- Attachment #1: Type: text/plain, Size: 416 bytes --]

On Tue, Jan 18, 2022 at 06:09:02PM +0100, Geert Uytterhoeven wrote:
> From: Thanh Quan <thanh.quan.xn@renesas.com>
> 
> Document support for the Watchdog Timer (WDT) Controller in the Renesas
> R-Car S4-8 (R8A779F0) SoC.
> 
> Signed-off-by: Thanh Quan <thanh.quan.xn@renesas.com>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 3/5] watchdog: renesas_wdt: Add R-Car Gen4 support
  2022-01-18 17:09 ` [PATCH 3/5] watchdog: renesas_wdt: Add R-Car Gen4 support Geert Uytterhoeven
@ 2022-02-08 12:41   ` Wolfram Sang
  2022-02-14 15:49   ` Guenter Roeck
  1 sibling, 0 replies; 17+ messages in thread
From: Wolfram Sang @ 2022-02-08 12:41 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Guenter Roeck,
	Rob Herring, Magnus Damm, LUU HOAI, linux-clk, devicetree,
	linux-watchdog, linux-renesas-soc, Thanh Quan

[-- Attachment #1: Type: text/plain, Size: 408 bytes --]

On Tue, Jan 18, 2022 at 06:09:03PM +0100, Geert Uytterhoeven wrote:
> From: Thanh Quan <thanh.quan.xn@renesas.com>
> 
> Add the compatible string for the R-Car Gen4 family.
> No further driver changes are needed.
> 
> Signed-off-by: Thanh Quan <thanh.quan.xn@renesas.com>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 4/5] arm64: dts: renesas: r8a779f0: Add RWDT node
  2022-01-18 17:09 ` [PATCH 4/5] arm64: dts: renesas: r8a779f0: Add RWDT node Geert Uytterhoeven
@ 2022-02-08 12:42   ` Wolfram Sang
  2022-02-14 15:51   ` Guenter Roeck
  1 sibling, 0 replies; 17+ messages in thread
From: Wolfram Sang @ 2022-02-08 12:42 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Guenter Roeck,
	Rob Herring, Magnus Damm, LUU HOAI, linux-clk, devicetree,
	linux-watchdog, linux-renesas-soc

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

On Tue, Jan 18, 2022 at 06:09:04PM +0100, Geert Uytterhoeven wrote:
> Add a device node for the RCLK Watchdog Timer (RWDT) on the Renesas
> R-Car S4-8 (R8A779F0) SoC.
> 
> Extracted from a larger patch in the BSP by LUU HOAI.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 5/5] arm64: dts: renesas: spider-cpu: Enable watchdog timer
  2022-01-18 17:09 ` [PATCH 5/5] arm64: dts: renesas: spider-cpu: Enable watchdog timer Geert Uytterhoeven
@ 2022-02-08 12:42   ` Wolfram Sang
  2022-02-14 15:52   ` Guenter Roeck
  1 sibling, 0 replies; 17+ messages in thread
From: Wolfram Sang @ 2022-02-08 12:42 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Guenter Roeck,
	Rob Herring, Magnus Damm, LUU HOAI, linux-clk, devicetree,
	linux-watchdog, linux-renesas-soc

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

On Tue, Jan 18, 2022 at 06:09:05PM +0100, Geert Uytterhoeven wrote:
> Enable the watchdog timer on the Spider board.
> 
> Extracted from a larger patch in the BSP by LUU HOAI.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 2/5] dt-bindings: watchdog: renesas-wdt: Document r8a779f0 support
  2022-01-18 17:09 ` [PATCH 2/5] dt-bindings: watchdog: renesas-wdt: Document r8a779f0 support Geert Uytterhoeven
  2022-02-08 12:39   ` Wolfram Sang
@ 2022-02-09  2:54   ` Rob Herring
  2022-02-14 15:48   ` Guenter Roeck
  2 siblings, 0 replies; 17+ messages in thread
From: Rob Herring @ 2022-02-09  2:54 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Guenter Roeck, devicetree, linux-clk, Rob Herring, Thanh Quan,
	LUU HOAI, Wim Van Sebroeck, linux-watchdog, Stephen Boyd,
	Michael Turquette, Wolfram Sang, linux-renesas-soc, Magnus Damm

On Tue, 18 Jan 2022 18:09:02 +0100, Geert Uytterhoeven wrote:
> From: Thanh Quan <thanh.quan.xn@renesas.com>
> 
> Document support for the Watchdog Timer (WDT) Controller in the Renesas
> R-Car S4-8 (R8A779F0) SoC.
> 
> Signed-off-by: Thanh Quan <thanh.quan.xn@renesas.com>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml | 5 +++++
>  1 file changed, 5 insertions(+)
> 

Acked-by: Rob Herring <robh@kernel.org>

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 2/5] dt-bindings: watchdog: renesas-wdt: Document r8a779f0 support
  2022-01-18 17:09 ` [PATCH 2/5] dt-bindings: watchdog: renesas-wdt: Document r8a779f0 support Geert Uytterhoeven
  2022-02-08 12:39   ` Wolfram Sang
  2022-02-09  2:54   ` Rob Herring
@ 2022-02-14 15:48   ` Guenter Roeck
  2 siblings, 0 replies; 17+ messages in thread
From: Guenter Roeck @ 2022-02-14 15:48 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Rob Herring,
	Magnus Damm, Wolfram Sang, LUU HOAI, linux-clk, devicetree,
	linux-watchdog, linux-renesas-soc, Thanh Quan

On Tue, Jan 18, 2022 at 06:09:02PM +0100, Geert Uytterhoeven wrote:
> From: Thanh Quan <thanh.quan.xn@renesas.com>
> 
> Document support for the Watchdog Timer (WDT) Controller in the Renesas
> R-Car S4-8 (R8A779F0) SoC.
> 
> Signed-off-by: Thanh Quan <thanh.quan.xn@renesas.com>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> Acked-by: Rob Herring <robh@kernel.org>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
> index 91a98ccd4226f505..d060438e1402d502 100644
> --- a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
> @@ -55,6 +55,11 @@ properties:
>                - renesas,r8a779a0-wdt     # R-Car V3U
>            - const: renesas,rcar-gen3-wdt # R-Car Gen3 and RZ/G2
>  
> +      - items:
> +          - enum:
> +              - renesas,r8a779f0-wdt     # R-Car S4-8
> +          - const: renesas,rcar-gen4-wdt # R-Car Gen4
> +
>    reg:
>      maxItems: 1
>  

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 3/5] watchdog: renesas_wdt: Add R-Car Gen4 support
  2022-01-18 17:09 ` [PATCH 3/5] watchdog: renesas_wdt: Add R-Car Gen4 support Geert Uytterhoeven
  2022-02-08 12:41   ` Wolfram Sang
@ 2022-02-14 15:49   ` Guenter Roeck
  1 sibling, 0 replies; 17+ messages in thread
From: Guenter Roeck @ 2022-02-14 15:49 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Rob Herring,
	Magnus Damm, Wolfram Sang, LUU HOAI, linux-clk, devicetree,
	linux-watchdog, linux-renesas-soc, Thanh Quan

On Tue, Jan 18, 2022 at 06:09:03PM +0100, Geert Uytterhoeven wrote:
> From: Thanh Quan <thanh.quan.xn@renesas.com>
> 
> Add the compatible string for the R-Car Gen4 family.
> No further driver changes are needed.
> 
> Signed-off-by: Thanh Quan <thanh.quan.xn@renesas.com>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/watchdog/renesas_wdt.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/watchdog/renesas_wdt.c b/drivers/watchdog/renesas_wdt.c
> index 5791198960e6c5bf..41d58ea5eb2f40fd 100644
> --- a/drivers/watchdog/renesas_wdt.c
> +++ b/drivers/watchdog/renesas_wdt.c
> @@ -327,6 +327,7 @@ static SIMPLE_DEV_PM_OPS(rwdt_pm_ops, rwdt_suspend, rwdt_resume);
>  static const struct of_device_id rwdt_ids[] = {
>  	{ .compatible = "renesas,rcar-gen2-wdt", },
>  	{ .compatible = "renesas,rcar-gen3-wdt", },
> +	{ .compatible = "renesas,rcar-gen4-wdt", },
>  	{ /* sentinel */ }
>  };
>  MODULE_DEVICE_TABLE(of, rwdt_ids);

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 1/5] clk: renesas: r8a779f0: Add WDT clock
  2022-01-18 17:09 ` [PATCH 1/5] clk: renesas: r8a779f0: Add WDT clock Geert Uytterhoeven
  2022-02-08 12:38   ` Wolfram Sang
@ 2022-02-14 15:50   ` Guenter Roeck
  1 sibling, 0 replies; 17+ messages in thread
From: Guenter Roeck @ 2022-02-14 15:50 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Rob Herring,
	Magnus Damm, Wolfram Sang, LUU HOAI, linux-clk, devicetree,
	linux-watchdog, linux-renesas-soc

On Tue, Jan 18, 2022 at 06:09:01PM +0100, Geert Uytterhoeven wrote:
> Add the module clock used by the RCLK Watchdog Timer (RWDT) on the
> Renesas R-Car S4-8 (r8a779f0) SoC.  Mark it as a critical clock, to
> ensure uninterrupted watchdog operation.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Acked-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/clk/renesas/r8a779f0-cpg-mssr.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/clk/renesas/r8a779f0-cpg-mssr.c b/drivers/clk/renesas/r8a779f0-cpg-mssr.c
> index 4100078406d67073..e48c5af7341454a7 100644
> --- a/drivers/clk/renesas/r8a779f0-cpg-mssr.c
> +++ b/drivers/clk/renesas/r8a779f0-cpg-mssr.c
> @@ -121,6 +121,11 @@ static const struct mssr_mod_clk r8a779f0_mod_clks[] __initconst = {
>  	DEF_MOD("scif4",	705,	R8A779F0_CLK_S0D12_PER),
>  	DEF_MOD("sys-dmac0",	709,	R8A779F0_CLK_S0D3_PER),
>  	DEF_MOD("sys-dmac1",	710,	R8A779F0_CLK_S0D3_PER),
> +	DEF_MOD("wdt",		907,	R8A779F0_CLK_R),
> +};
> +
> +static const unsigned int r8a779f0_crit_mod_clks[] __initconst = {
> +	MOD_CLK_ID(907),	/* WDT */
>  };
>  
>  /*
> @@ -177,6 +182,10 @@ const struct cpg_mssr_info r8a779f0_cpg_mssr_info __initconst = {
>  	.num_mod_clks = ARRAY_SIZE(r8a779f0_mod_clks),
>  	.num_hw_mod_clks = 28 * 32,
>  
> +	/* Critical Module Clocks */
> +	.crit_mod_clks = r8a779f0_crit_mod_clks,
> +	.num_crit_mod_clks = ARRAY_SIZE(r8a779f0_crit_mod_clks),
> +
>  	/* Callbacks */
>  	.init = r8a779f0_cpg_mssr_init,
>  	.cpg_clk_register = rcar_gen4_cpg_clk_register,

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 4/5] arm64: dts: renesas: r8a779f0: Add RWDT node
  2022-01-18 17:09 ` [PATCH 4/5] arm64: dts: renesas: r8a779f0: Add RWDT node Geert Uytterhoeven
  2022-02-08 12:42   ` Wolfram Sang
@ 2022-02-14 15:51   ` Guenter Roeck
  1 sibling, 0 replies; 17+ messages in thread
From: Guenter Roeck @ 2022-02-14 15:51 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Rob Herring,
	Magnus Damm, Wolfram Sang, LUU HOAI, linux-clk, devicetree,
	linux-watchdog, linux-renesas-soc

On Tue, Jan 18, 2022 at 06:09:04PM +0100, Geert Uytterhoeven wrote:
> Add a device node for the RCLK Watchdog Timer (RWDT) on the Renesas
> R-Car S4-8 (R8A779F0) SoC.
> 
> Extracted from a larger patch in the BSP by LUU HOAI.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Acked-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/renesas/r8a779f0.dtsi b/arch/arm64/boot/dts/renesas/r8a779f0.dtsi
> index 5426532d10e2a472..0ac8c345558efc17 100644
> --- a/arch/arm64/boot/dts/renesas/r8a779f0.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a779f0.dtsi
> @@ -59,6 +59,16 @@ soc: soc {
>  		#size-cells = <2>;
>  		ranges;
>  
> +		rwdt: watchdog@e6020000 {
> +			compatible = "renesas,r8a779f0-wdt",
> +				     "renesas,rcar-gen4-wdt";
> +			reg = <0 0xe6020000 0 0x0c>;
> +			clocks = <&cpg CPG_MOD 907>;
> +			power-domains = <&sysc R8A779F0_PD_ALWAYS_ON>;
> +			resets = <&cpg 907>;
> +			status = "disabled";
> +		};
> +
>  		cpg: clock-controller@e6150000 {
>  			compatible = "renesas,r8a779f0-cpg-mssr";
>  			reg = <0 0xe6150000 0 0x4000>;

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH 5/5] arm64: dts: renesas: spider-cpu: Enable watchdog timer
  2022-01-18 17:09 ` [PATCH 5/5] arm64: dts: renesas: spider-cpu: Enable watchdog timer Geert Uytterhoeven
  2022-02-08 12:42   ` Wolfram Sang
@ 2022-02-14 15:52   ` Guenter Roeck
  1 sibling, 0 replies; 17+ messages in thread
From: Guenter Roeck @ 2022-02-14 15:52 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Michael Turquette, Stephen Boyd, Wim Van Sebroeck, Rob Herring,
	Magnus Damm, Wolfram Sang, LUU HOAI, linux-clk, devicetree,
	linux-watchdog, linux-renesas-soc

On Tue, Jan 18, 2022 at 06:09:05PM +0100, Geert Uytterhoeven wrote:
> Enable the watchdog timer on the Spider board.
> 
> Extracted from a larger patch in the BSP by LUU HOAI.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Acked-by: Guenter Roeck <linux@roeck-us.net>

> ---
> For the watchdog to be able to actually reboot the system, this depends
> on proper configuration of the Watchdog Timer Reset Control Register
> (WDTRSTCR) in the Reset (RST) module, either by Linux[1], or by the
> firmware.
> 
> [1] "[PATCH LOCAL v2] soc: renesas: rcar-rst: Allow WDT reset on R-Car
>      Gen4"
>     https://lore.kernel.org/r/39005cf749a99afc6d3ba96ff155fd2a231418a8.1642524743.git.geert+renesas@glider.be
> ---
>  arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi b/arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi
> index 156586532c844c41..3a90932fe85c8243 100644
> --- a/arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a779f0-spider-cpu.dtsi
> @@ -31,6 +31,11 @@ &extalr_clk {
>  	clock-frequency = <32768>;
>  };
>  
> +&rwdt {
> +	timeout-sec = <60>;
> +	status = "okay";
> +};
> +
>  &scif3 {
>  	status = "okay";
>  };

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2022-02-14 15:52 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-18 17:09 [PATCH 0/5] arm64: renesas: Add R-Car S4-8 watchdog support on Spider Geert Uytterhoeven
2022-01-18 17:09 ` [PATCH 1/5] clk: renesas: r8a779f0: Add WDT clock Geert Uytterhoeven
2022-02-08 12:38   ` Wolfram Sang
2022-02-14 15:50   ` Guenter Roeck
2022-01-18 17:09 ` [PATCH 2/5] dt-bindings: watchdog: renesas-wdt: Document r8a779f0 support Geert Uytterhoeven
2022-02-08 12:39   ` Wolfram Sang
2022-02-09  2:54   ` Rob Herring
2022-02-14 15:48   ` Guenter Roeck
2022-01-18 17:09 ` [PATCH 3/5] watchdog: renesas_wdt: Add R-Car Gen4 support Geert Uytterhoeven
2022-02-08 12:41   ` Wolfram Sang
2022-02-14 15:49   ` Guenter Roeck
2022-01-18 17:09 ` [PATCH 4/5] arm64: dts: renesas: r8a779f0: Add RWDT node Geert Uytterhoeven
2022-02-08 12:42   ` Wolfram Sang
2022-02-14 15:51   ` Guenter Roeck
2022-01-18 17:09 ` [PATCH 5/5] arm64: dts: renesas: spider-cpu: Enable watchdog timer Geert Uytterhoeven
2022-02-08 12:42   ` Wolfram Sang
2022-02-14 15:52   ` Guenter Roeck

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.