[PATCH 0/3] arm64: dts: r8a7796: Add watchdog support

[PATCH 0/3] arm64: dts: r8a7796: Add watchdog support

[Geert Uytterhoeven]

	Hi Wim, Günter, Simon, Magnus,

This patch series adds support for the Watchdog Timer (WDT) Controller
in the Renesas R-Car M3-W (r8a7796) SoC.
        
  - The first patch updates the DT binding documentation for the Renesas
    WDT driver, and should go in through the watchdog tree.
  - The remaining patches update the DTS for the r8a7796 SoC and
    Salvator-X development board, and should go in through the renesas
    tree. This can happen as soon as the DT binding update has been
    accepted.

To use the watchdog, there is a runtime dependency on "[PATCH 0/2] clk:
renesas: r8a7796: Add watchdog clocks".

This has been tested on r8a7796/Salvator-X.

Thanks!

Geert Uytterhoeven (3):
  watchdog: renesas-wdt: Add support for the r8a7796 wdt
  arm64: dts: r8a7796: Add RWDT node
  arm64: dts: r8a7796/salvator-x: Enable watchdog timer

 Documentation/devicetree/bindings/watchdog/renesas-wdt.txt | 6 +++++-
 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts         | 5 +++++
 arch/arm64/boot/dts/renesas/r8a7796.dtsi                   | 9 +++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

-- 
1.9.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

[PATCH 1/3] watchdog: renesas-wdt: Add support for the r8a7796 wdt

[Geert Uytterhoeven]

Document support for the Watchdog Timer (WDT) Controller in the Renesas
R-Car M3-W (r8a7796) SoC.

No driver update is needed.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 Documentation/devicetree/bindings/watchdog/renesas-wdt.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt b/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
index b9512f1eb80a0205..da24e31334177768 100644
--- a/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
@@ -1,7 +1,11 @@
 Renesas Watchdog Timer (WDT) Controller
 
 Required properties:
-- compatible : Should be "renesas,r8a7795-wdt", or "renesas,rcar-gen3-wdt"
+- compatible : Should be "renesas,<soctype>-wdt", and
+	       "renesas,rcar-gen3-wdt" as fallback.
+	       Examples with soctypes are:
+	         - "renesas,r8a7795-wdt" (R-Car H3)
+	         - "renesas,r8a7796-wdt" (R-Car M3-W)
 
   When compatible with the generic version, nodes must list the SoC-specific
   version corresponding to the platform first, followed by the generic
-- 
1.9.1

[PATCH 2/3] arm64: dts: r8a7796: Add RWDT node

[Geert Uytterhoeven]

Add a device node for the Watchdog Timer (WDT) controller on the Renesas
R-Car M3-W (r8a7796) SoC.

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

diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index fab61eddede3818c..1edf82440d784592 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -98,6 +98,15 @@
 					(GIC_CPU_MASK_SIMPLE(1) | IRQ_TYPE_LEVEL_LOW)>;
 		};
 
+		wdt0: watchdog@e6020000 {
+			compatible = "renesas,r8a7796-wdt",
+				     "renesas,rcar-gen3-wdt";
+			reg = <0 0xe6020000 0 0x0c>;
+			clocks = <&cpg CPG_MOD 402>;
+			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+			status = "disabled";
+		};
+
 		cpg: clock-controller@e6150000 {
 			compatible = "renesas,r8a7796-cpg-mssr";
 			reg = <0 0xe6150000 0 0x1000>;
-- 
1.9.1

[PATCH 3/3] arm64: dts: r8a7796/salvator-x: Enable watchdog timer

[Geert Uytterhoeven]

Enable the Watchdog Timer (WDT) controller on the Renesas Salvator-X
board equipped with an R-Car M3-W (r8a7796) SoC.

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

diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
index 9c52613fb88c9699..e72be3856d792516 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
@@ -43,3 +43,8 @@
 	clock-frequency = <14745600>;
 	status = "okay";
 };
+
+&wdt0 {
+	timeout-sec = <60>;
+	status = "okay";
+};
-- 
1.9.1

Re: [PATCH 1/3] watchdog: renesas-wdt: Add support for the r8a7796 wdt

[Wolfram Sang]

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

On Mon, Jun 27, 2016 at 07:50:45PM +0200, Geert Uytterhoeven wrote:
> Document support for the Watchdog Timer (WDT) Controller in the Renesas
> R-Car M3-W (r8a7796) SoC.
> 
> No driver update is needed.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>

Acked-by: Wolfram Sang <wsa+renesas-jBu1N2QxHDJrcw3mvpCnnVaTQe2KTcn/@public.gmane.org>


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

Re: [PATCH 2/3] arm64: dts: r8a7796: Add RWDT node

[Wolfram Sang]

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

On Mon, Jun 27, 2016 at 07:50:46PM +0200, Geert Uytterhoeven wrote:
> Add a device node for the Watchdog Timer (WDT) controller on the Renesas
> R-Car M3-W (r8a7796) SoC.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

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


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

Re: [PATCH 3/3] arm64: dts: r8a7796/salvator-x: Enable watchdog timer

[Wolfram Sang]

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

On Mon, Jun 27, 2016 at 07:50:47PM +0200, Geert Uytterhoeven wrote:
> Enable the Watchdog Timer (WDT) controller on the Renesas Salvator-X
> board equipped with an R-Car M3-W (r8a7796) SoC.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

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


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

Re: [PATCH 0/3] arm64: dts: r8a7796: Add watchdog support

[Simon Horman]

On Mon, Jun 27, 2016 at 07:50:44PM +0200, Geert Uytterhoeven wrote:
> 	Hi Wim, Günter, Simon, Magnus,
> 
> This patch series adds support for the Watchdog Timer (WDT) Controller
> in the Renesas R-Car M3-W (r8a7796) SoC.
>         
>   - The first patch updates the DT binding documentation for the Renesas
>     WDT driver, and should go in through the watchdog tree.
>   - The remaining patches update the DTS for the r8a7796 SoC and
>     Salvator-X development board, and should go in through the renesas
>     tree. This can happen as soon as the DT binding update has been
>     accepted.

As the binding update seems minor and unlikely to be rejected
I have taken the liberty of queueing up the DTS patches now.

> 
> To use the watchdog, there is a runtime dependency on "[PATCH 0/2] clk:
> renesas: r8a7796: Add watchdog clocks".
> 
> This has been tested on r8a7796/Salvator-X.
> 
> Thanks!
> 
> Geert Uytterhoeven (3):
>   watchdog: renesas-wdt: Add support for the r8a7796 wdt
>   arm64: dts: r8a7796: Add RWDT node
>   arm64: dts: r8a7796/salvator-x: Enable watchdog timer
> 
>  Documentation/devicetree/bindings/watchdog/renesas-wdt.txt | 6 +++++-
>  arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts         | 5 +++++
>  arch/arm64/boot/dts/renesas/r8a7796.dtsi                   | 9 +++++++++
>  3 files changed, 19 insertions(+), 1 deletion(-)
> 
> -- 
> 1.9.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
> 

Re: [PATCH 1/3] watchdog: renesas-wdt: Add support for the r8a7796 wdt

[Rob Herring]

On Mon, Jun 27, 2016 at 07:50:45PM +0200, Geert Uytterhoeven wrote:
> Document support for the Watchdog Timer (WDT) Controller in the Renesas
> R-Car M3-W (r8a7796) SoC.
> 
> No driver update is needed.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  Documentation/devicetree/bindings/watchdog/renesas-wdt.txt | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)

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