[cip-dev] [PATCH 4.4.y-cip 0/6] Add CMT/RWDT support

[cip-dev] [PATCH 4.4.y-cip 0/6] Add CMT/RWDT support

[Biju Das]

This patch series add CMT/RWDT support for RZ/G1C based iwg23s-sbc.

Backported the relevent patches to linux-4.4.y-cip.

Biju Das (6):
  dt-bindings: watchdog: renesas-wdt: Document r8a77470 support
  ARM: dts: r8a77470: Add watchdog support to SoC dtsi
  ARM: dts: iwg23s-sbc: Enable watchdog support
  dt-bindings: timer: renesas, cmt: Document r8a77470 CMT support
  ARM: dts: r8a77470: Add CMT SoC specific support
  ARM: dts: iwg23s-sbc: Enable cmt0

 .../devicetree/bindings/timer/renesas,cmt.txt      |  2 +
 .../devicetree/bindings/watchdog/renesas-wdt.txt   |  1 +
 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts          |  9 +++++
 arch/arm/boot/dts/r8a77470.dtsi                    | 45 ++++++++++++++++++++++
 4 files changed, 57 insertions(+)

-- 
2.7.4

[cip-dev] [PATCH 4.4.y-cip 1/6] dt-bindings: watchdog: renesas-wdt: Document r8a77470 support

[Biju Das]

commit 59600d045ff411da193a8b5a2999681801ecd430 upstream.

RZ/G1C (R8A77470) watchdog implementation is compatible with R-Car
Gen2, therefore add relevant documentation.

Signed-off-by: Biju Das <biju.das@bp.renesas.com>
Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
---
 Documentation/devicetree/bindings/watchdog/renesas-wdt.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt b/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
index 25b108e..010f109 100644
--- a/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
@@ -7,6 +7,7 @@ Required properties:
 	       Examples with soctypes are:
 		 - "renesas,r8a7743-wdt" (RZ/G1M)
 		 - "renesas,r8a7745-wdt" (RZ/G1E)
+		 - "renesas,r8a77470-wdt" (RZ/G1C)
 		The generic compatible string must be:
 		 - "renesas,rcar-gen2-wdt" for R-Car Gen2 and RZ/G
 
-- 
2.7.4

[cip-dev] [PATCH 4.4.y-cip 1/6] dt-bindings: watchdog: renesas-wdt: Document r8a77470 support

[nobuhiro1.iwamatsu at toshiba.co.jp]

Hi,

> -----Original Message-----
> From: Biju Das [mailto:biju.das at bp.renesas.com]
> Sent: Thursday, November 21, 2019 1:47 AM
> To: cip-dev at lists.cip-project.org; iwamatsu nobuhiro(?? ?? ???
> ?????) <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek
> <pavel@denx.de>
> Cc: Chris Paterson <chris.paterson2@renesas.com>; Biju Das
> <biju.das@bp.renesas.com>; Fabrizio Castro
> <fabrizio.castro@bp.renesas.com>
> Subject: [PATCH 4.4.y-cip 1/6] dt-bindings: watchdog: renesas-wdt:
> Document r8a77470 support
> 
> commit 59600d045ff411da193a8b5a2999681801ecd430 upstream.
> 
> RZ/G1C (R8A77470) watchdog implementation is compatible with R-Car Gen2,
> therefore add relevant documentation.
> 
> Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> Reviewed-by: Rob Herring <robh@kernel.org>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

Hmm, I can not apply this patch.
  https://patchwork.kernel.org/patch/11254441/mbox/
----
error: patch failed: Documentation/devicetree/bindings/watchdog/renesas-wdt.txt:7
----

Could you check on your environment?

Best regards,
  Nobuhiro

[cip-dev] [PATCH 4.4.y-cip 1/6] dt-bindings: watchdog: renesas-wdt: Document r8a77470 support

[Biju Das]

Hi Nobuhiro-San,

Thanks for the feedback.

> -----Original Message-----
> From: nobuhiro1.iwamatsu at toshiba.co.jp
> <nobuhiro1.iwamatsu@toshiba.co.jp>
> Sent: Thursday, November 21, 2019 12:32 AM
> To: Biju Das <biju.das@bp.renesas.com>; cip-dev at lists.cip-project.org;
> pavel at denx.de
> Cc: Chris Paterson <Chris.Paterson2@renesas.com>; Fabrizio Castro
> <fabrizio.castro@bp.renesas.com>
> Subject: RE: [PATCH 4.4.y-cip 1/6] dt-bindings: watchdog: renesas-wdt:
> Document r8a77470 support
> 
> Hi,
> 
> > -----Original Message-----
> > From: Biju Das [mailto:biju.das at bp.renesas.com]
> > Sent: Thursday, November 21, 2019 1:47 AM
> > To: cip-dev at lists.cip-project.org; iwamatsu nobuhiro(?? ?? ???
> > ?????) <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek
> > <pavel@denx.de>
> > Cc: Chris Paterson <chris.paterson2@renesas.com>; Biju Das
> > <biju.das@bp.renesas.com>; Fabrizio Castro
> > <fabrizio.castro@bp.renesas.com>
> > Subject: [PATCH 4.4.y-cip 1/6] dt-bindings: watchdog: renesas-wdt:
> > Document r8a77470 support
> >
> > commit 59600d045ff411da193a8b5a2999681801ecd430 upstream.
> >
> > RZ/G1C (R8A77470) watchdog implementation is compatible with R-Car
> > Gen2, therefore add relevant documentation.
> >
> > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> > Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> > Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> > Reviewed-by: Rob Herring <robh@kernel.org>
> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> > Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
> 
> Hmm, I can not apply this patch.
>   https://patchwork.kernel.org/patch/11254441/mbox/
> ----
> error: patch failed: Documentation/devicetree/bindings/watchdog/renesas-
> wdt.txt:7
> ----
> 
> Could you check on your environment?

It could be related to r8a7744 dependency. I have rebased this patches on top of latest 4.4.y-cip branch and 
Looks ok.

git rebase remotes/origin/linux-4.4.y-cip
First, rewinding head to replay your work on top of it...
Applying: dt-bindings: watchdog: renesas-wdt: Document r8a77470 support
Using index info to reconstruct a base tree...
M	Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
Falling back to patching base and 3-way merge...
Auto-merging Documentation/devicetree/bindings/watchdog/renesas-wdt.txt
Applying: ARM: dts: r8a77470: Add watchdog support to SoC dtsi
Applying: ARM: dts: iwg23s-sbc: Enable watchdog support
Applying: dt-bindings: timer: renesas, cmt: Document r8a77470 CMT support
Applying: ARM: dts: r8a77470: Add CMT SoC specific support
Applying: ARM: dts: iwg23s-sbc: Enable cmt0

I will send this merged patch soon.

Regards,
Biju

[cip-dev] [PATCH 4.4.y-cip 2/6] ARM: dts: r8a77470: Add watchdog support to SoC dtsi

[Biju Das]

commit dc7bf8795d848890641387d98c5e1324d397e9c8 upstream.

This patch adds watchdog support to the r8a77470 SoC dtsi.

Signed-off-by: Biju Das <biju.das@bp.renesas.com>
Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
[simon: moved node to preserve sort order]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
[biju: updated power-domains and clocks property. removed resets property]
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
 arch/arm/boot/dts/r8a77470.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/r8a77470.dtsi b/arch/arm/boot/dts/r8a77470.dtsi
index 568f650..fc1333e 100644
--- a/arch/arm/boot/dts/r8a77470.dtsi
+++ b/arch/arm/boot/dts/r8a77470.dtsi
@@ -76,6 +76,15 @@
 		#size-cells = <2>;
 		ranges;
 
+		rwdt: watchdog at e6020000 {
+			compatible = "renesas,r8a77470-wdt",
+				     "renesas,rcar-gen2-wdt";
+			reg = <0 0xe6020000 0 0x0c>;
+			clocks = <&mstp4_clks R8A77470_CLK_RWDT>;
+			power-domains = <&cpg_clocks>;
+			status = "disabled";
+		};
+
 		gpio0: gpio at e6050000 {
 			compatible = "renesas,gpio-r8a77470",
 				     "renesas,rcar-gen2-gpio";
-- 
2.7.4

[cip-dev] [PATCH 4.4.y-cip 3/6] ARM: dts: iwg23s-sbc: Enable watchdog support

[Biju Das]

commit e1d31e7ebaa4087ecc7a5e16197f7fa6857aaa75 upstream.

This patch enables watchdog support on the iWave iwg23s sbc.

Signed-off-by: Biju Das <biju.das@bp.renesas.com>
Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts b/arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts
index 273acc8..6cae910 100644
--- a/arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts
+++ b/arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts
@@ -126,6 +126,11 @@
 	};
 };
 
+&rwdt {
+	timeout-sec = <60>;
+	status = "okay";
+};
+
 &scif1 {
 	pinctrl-0 = <&scif1_pins>;
 	pinctrl-names = "default";
-- 
2.7.4

[cip-dev] [PATCH 4.4.y-cip 4/6] dt-bindings: timer: renesas, cmt: Document r8a77470 CMT support

[Biju Das]

commit 2bbaf54216448486def1153486778a975a73041d upstream.

Document SoC specific compatible strings for r8a77470. No driver change
is needed as the fallback strings will activate the right code.

Signed-off-by: Biju Das <biju.das@bp.renesas.com>
Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
[biju: backported to 4.4-cip kernel]
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
 Documentation/devicetree/bindings/timer/renesas,cmt.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/timer/renesas,cmt.txt b/Documentation/devicetree/bindings/timer/renesas,cmt.txt
index ed3dbf6..f070152 100644
--- a/Documentation/devicetree/bindings/timer/renesas,cmt.txt
+++ b/Documentation/devicetree/bindings/timer/renesas,cmt.txt
@@ -48,6 +48,8 @@ Required Properties:
 		(CMT[01])
     - "renesas,cmt-48-r8a7745" for the r8a7745 48-bit CMT
 		(CMT[01])
+    - "renesas,cmt-48-r8a77470" for the r8a77470 48-bit CMT
+		(CMT[01])
     - "renesas,cmt-48-r8a7790" for the r8a7790 48-bit CMT
 		(CMT[01])
     - "renesas,cmt-48-r8a7791" for the r8a7791 48-bit CMT
-- 
2.7.4

[cip-dev] [PATCH 4.4.y-cip 5/6] ARM: dts: r8a77470: Add CMT SoC specific support

[Biju Das]

commit 8129890823855fedab15bc0df1f89beaac5653db upstream.

Add CMT[01] support to r8a77470 SoC DT.

Signed-off-by: Biju Das <biju.das@bp.renesas.com>
Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
[biju: removed reset property. updated compatible, power-domains
and clocks properties]
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
 arch/arm/boot/dts/r8a77470.dtsi | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/arch/arm/boot/dts/r8a77470.dtsi b/arch/arm/boot/dts/r8a77470.dtsi
index fc1333e..9774ab0 100644
--- a/arch/arm/boot/dts/r8a77470.dtsi
+++ b/arch/arm/boot/dts/r8a77470.dtsi
@@ -677,6 +677,42 @@
 			power-domains = <&cpg_clocks>;
 		};
 
+		cmt0: timer at ffca0000 {
+			compatible = "renesas,cmt-48-r8a77470",
+				     "renesas,cmt-48-gen2";
+			reg = <0 0xffca0000 0 0x1004>;
+			interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp1_clks R8A77470_CLK_CMT0>;
+			clock-names = "fck";
+			power-domains = <&cpg_clocks>;
+
+			renesas,channels-mask = <0x60>;
+
+			status = "disabled";
+		};
+
+		cmt1: timer at e6130000 {
+			compatible = "renesas,cmt-48-r8a77470",
+				     "renesas,cmt-48-gen2";
+			reg = <0 0xe6130000 0 0x1004>;
+			interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp3_clks R8A77470_CLK_CMT1>;
+			clock-names = "fck";
+			power-domains = <&cpg_clocks>;
+
+			renesas,channels-mask = <0xff>;
+
+			status = "disabled";
+		};
+
 		clocks {
 			#address-cells = <2>;
 			#size-cells = <2>;
-- 
2.7.4

[cip-dev] [PATCH 4.4.y-cip 6/6] ARM: dts: iwg23s-sbc: Enable cmt0

[Biju Das]

commit b5079d767b881b0f516df6627e0c4297137fa5d0 upstream.

This patch enables cmt0 support on the iWave iwg23s sbc.

Signed-off-by: Biju Das <biju.das@bp.renesas.com>
Reviewed-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts b/arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts
index 6cae910..8c9c312d 100644
--- a/arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts
+++ b/arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts
@@ -44,6 +44,10 @@
 	};
 };
 
+&cmt0 {
+	status = "okay";
+};
+
 &ehci1 {
 	status = "okay";
 };
-- 
2.7.4

[cip-dev] [PATCH 4.4.y-cip 0/6] Add CMT/RWDT support

[Pavel Machek]

Hi!

> This patch series add CMT/RWDT support for RZ/G1C based iwg23s-sbc.
> 
> Backported the relevent patches to linux-4.4.y-cip.

This looks okay, too. I'll apply it if there are no objections.

Best regards,
								Pavel
-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191120/e9d9ee1c/attachment.sig>

[cip-dev] [PATCH 4.4.y-cip 0/6] Add CMT/RWDT support

[Pavel Machek]

On Wed 2019-11-20 16:47:14, Biju Das wrote:
> This patch series add CMT/RWDT support for RZ/G1C based iwg23s-sbc.
> 
> Backported the relevent patches to linux-4.4.y-cip.

Thanks, applied with v2 of the first patch.

Best regards,
								Pavel

> Biju Das (6):
>   dt-bindings: watchdog: renesas-wdt: Document r8a77470 support
>   ARM: dts: r8a77470: Add watchdog support to SoC dtsi
>   ARM: dts: iwg23s-sbc: Enable watchdog support
>   dt-bindings: timer: renesas, cmt: Document r8a77470 CMT support
>   ARM: dts: r8a77470: Add CMT SoC specific support
>   ARM: dts: iwg23s-sbc: Enable cmt0

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.cip-project.org/pipermail/cip-dev/attachments/20191121/9cc96492/attachment.sig>