linux-renesas-soc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] r8a779g0: add TMU support
@ 2022-11-04 15:11 Wolfram Sang
  2022-11-04 15:11 ` [PATCH 1/3] clk: renesas: r8a779g0: Add CMT clocks Wolfram Sang
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Wolfram Sang @ 2022-11-04 15:11 UTC (permalink / raw)
  To: linux-renesas-soc; +Cc: Wolfram Sang, devicetree, linux-clk, linux-kernel

Here are the clk and DTS changes to enable CMT timers on the R-Car V4H
based WhiteHawk board. Tested with the 'clocksource-switch' selftest.
Nothing special, very similar to S4-8. That means the "cannot clear
CMCNT" error is also present like on every Gen4 SoC so far. Fixing this
is a seperate thing and the next step for CMT. Thanks and happy hacking!


Thanh Quan (1):
  arm64: dts: renesas: r8a779g0: Add CMT node

Wolfram Sang (2):
  clk: renesas: r8a779g0: Add CMT clocks
  TEST: arm64: dts: renesas: white-hawk-cpu: Enable CMT

 .../dts/renesas/r8a779g0-white-hawk-cpu.dtsi  | 16 +++++
 arch/arm64/boot/dts/renesas/r8a779g0.dtsi     | 70 +++++++++++++++++++
 drivers/clk/renesas/r8a779g0-cpg-mssr.c       |  4 ++
 3 files changed, 90 insertions(+)

-- 
2.35.1


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

* [PATCH 1/3] clk: renesas: r8a779g0: Add CMT clocks
  2022-11-04 15:11 [PATCH 0/3] r8a779g0: add TMU support Wolfram Sang
@ 2022-11-04 15:11 ` Wolfram Sang
  2022-11-07 16:27   ` Geert Uytterhoeven
  2022-11-04 15:11 ` [PATCH 2/3] arm64: dts: renesas: r8a779g0: Add CMT node Wolfram Sang
  2022-11-04 15:11 ` [PATCH 3/3] TEST: arm64: dts: renesas: white-hawk-cpu: Enable CMT Wolfram Sang
  2 siblings, 1 reply; 6+ messages in thread
From: Wolfram Sang @ 2022-11-04 15:11 UTC (permalink / raw)
  To: linux-renesas-soc
  Cc: Wolfram Sang, Geert Uytterhoeven, Michael Turquette,
	Stephen Boyd, linux-clk, linux-kernel

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 drivers/clk/renesas/r8a779g0-cpg-mssr.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/clk/renesas/r8a779g0-cpg-mssr.c b/drivers/clk/renesas/r8a779g0-cpg-mssr.c
index 7f0b4f75ff4d..1da48c81d3dd 100644
--- a/drivers/clk/renesas/r8a779g0-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a779g0-cpg-mssr.c
@@ -193,6 +193,10 @@ static const struct mssr_mod_clk r8a779g0_mod_clks[] __initconst = {
 	DEF_MOD("tmu4",		717,	R8A779G0_CLK_SASYNCPERD2),
 	DEF_MOD("tpu0",		718,	R8A779G0_CLK_SASYNCPERD4),
 	DEF_MOD("wdt1:wdt0",	907,	R8A779G0_CLK_R),
+	DEF_MOD("cmt0",		910,	R8A779G0_CLK_R),
+	DEF_MOD("cmt1",		911,	R8A779G0_CLK_R),
+	DEF_MOD("cmt2",		912,	R8A779G0_CLK_R),
+	DEF_MOD("cmt3",		913,	R8A779G0_CLK_R),
 	DEF_MOD("pfc0",		915,	R8A779G0_CLK_CL16M),
 	DEF_MOD("pfc1",		916,	R8A779G0_CLK_CL16M),
 	DEF_MOD("pfc2",		917,	R8A779G0_CLK_CL16M),
-- 
2.35.1


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

* [PATCH 2/3] arm64: dts: renesas: r8a779g0: Add CMT node
  2022-11-04 15:11 [PATCH 0/3] r8a779g0: add TMU support Wolfram Sang
  2022-11-04 15:11 ` [PATCH 1/3] clk: renesas: r8a779g0: Add CMT clocks Wolfram Sang
@ 2022-11-04 15:11 ` Wolfram Sang
  2022-11-07 16:29   ` Geert Uytterhoeven
  2022-11-04 15:11 ` [PATCH 3/3] TEST: arm64: dts: renesas: white-hawk-cpu: Enable CMT Wolfram Sang
  2 siblings, 1 reply; 6+ messages in thread
From: Wolfram Sang @ 2022-11-04 15:11 UTC (permalink / raw)
  To: linux-renesas-soc
  Cc: Thanh Quan, Wolfram Sang, Geert Uytterhoeven, Magnus Damm,
	Rob Herring, Krzysztof Kozlowski, devicetree, linux-kernel

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

Signed-off-by: Thanh Quan <thanh.quan.xn@renesas.com>
[wsa: merged the fixes into this one and rebased]
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 70 +++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a779g0.dtsi b/arch/arm64/boot/dts/renesas/r8a779g0.dtsi
index fbab9817cc8c..0ea48fa18df3 100644
--- a/arch/arm64/boot/dts/renesas/r8a779g0.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779g0.dtsi
@@ -214,6 +214,76 @@ gpio8: gpio@e6068180 {
 			#interrupt-cells = <2>;
 		};
 
+		cmt0: timer@e60f0000 {
+			compatible = "renesas,r8a779g0-cmt0",
+				     "renesas,rcar-gen4-cmt0";
+			reg = <0 0xe60f0000 0 0x1004>;
+			interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 910>;
+			clock-names = "fck";
+			power-domains = <&sysc R8A779G0_PD_ALWAYS_ON>;
+			resets = <&cpg 910>;
+			status = "disabled";
+		};
+
+		cmt1: timer@e6130000 {
+			compatible = "renesas,r8a779g0-cmt1",
+				     "renesas,rcar-gen4-cmt1";
+			reg = <0 0xe6130000 0 0x1004>;
+			interrupts = <GIC_SPI 262 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 911>;
+			clock-names = "fck";
+			power-domains = <&sysc R8A779G0_PD_ALWAYS_ON>;
+			resets = <&cpg 911>;
+			status = "disabled";
+		};
+
+		cmt2: timer@e6140000 {
+			compatible = "renesas,r8a779g0-cmt1",
+				     "renesas,rcar-gen4-cmt1";
+			reg = <0 0xe6140000 0 0x1004>;
+			interrupts = <GIC_SPI 270 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 271 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 273 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 274 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 275 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 276 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 277 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 912>;
+			clock-names = "fck";
+			power-domains = <&sysc R8A779G0_PD_ALWAYS_ON>;
+			resets = <&cpg 912>;
+			status = "disabled";
+		};
+
+		cmt3: timer@e6148000 {
+			compatible = "renesas,r8a779g0-cmt1",
+				     "renesas,rcar-gen4-cmt1";
+			reg = <0 0xe6148000 0 0x1004>;
+			interrupts = <GIC_SPI 278 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 284 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 285 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 913>;
+			clock-names = "fck";
+			power-domains = <&sysc R8A779G0_PD_ALWAYS_ON>;
+			resets = <&cpg 913>;
+			status = "disabled";
+		};
+
 		cpg: clock-controller@e6150000 {
 			compatible = "renesas,r8a779g0-cpg-mssr";
 			reg = <0 0xe6150000 0 0x4000>;
-- 
2.35.1


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

* [PATCH 3/3] TEST: arm64: dts: renesas: white-hawk-cpu: Enable CMT
  2022-11-04 15:11 [PATCH 0/3] r8a779g0: add TMU support Wolfram Sang
  2022-11-04 15:11 ` [PATCH 1/3] clk: renesas: r8a779g0: Add CMT clocks Wolfram Sang
  2022-11-04 15:11 ` [PATCH 2/3] arm64: dts: renesas: r8a779g0: Add CMT node Wolfram Sang
@ 2022-11-04 15:11 ` Wolfram Sang
  2 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2022-11-04 15:11 UTC (permalink / raw)
  To: linux-renesas-soc
  Cc: Wolfram Sang, Geert Uytterhoeven, Magnus Damm, Rob Herring,
	Krzysztof Kozlowski, devicetree, linux-kernel

This patch enables CMT{0|1|2|3} on the WhiteHawk board.

Only for testing, not for upstream!

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 .../dts/renesas/r8a779g0-white-hawk-cpu.dtsi     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi b/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi
index c10740aee9f6..7f565e161662 100644
--- a/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi
@@ -279,3 +279,19 @@ &rwdt {
 &scif_clk {
 	clock-frequency = <24000000>;
 };
+
+&cmt0 {
+	status = "okay";
+};
+
+&cmt1 {
+	status = "okay";
+};
+
+&cmt2 {
+	status = "okay";
+};
+
+&cmt3 {
+	status = "okay";
+};
-- 
2.35.1


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

* Re: [PATCH 1/3] clk: renesas: r8a779g0: Add CMT clocks
  2022-11-04 15:11 ` [PATCH 1/3] clk: renesas: r8a779g0: Add CMT clocks Wolfram Sang
@ 2022-11-07 16:27   ` Geert Uytterhoeven
  0 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2022-11-07 16:27 UTC (permalink / raw)
  To: Wolfram Sang
  Cc: linux-renesas-soc, Michael Turquette, Stephen Boyd, linux-clk,
	linux-kernel

On Fri, Nov 4, 2022 at 4:11 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in renesas-clk-for-v6.2.

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] 6+ messages in thread

* Re: [PATCH 2/3] arm64: dts: renesas: r8a779g0: Add CMT node
  2022-11-04 15:11 ` [PATCH 2/3] arm64: dts: renesas: r8a779g0: Add CMT node Wolfram Sang
@ 2022-11-07 16:29   ` Geert Uytterhoeven
  0 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2022-11-07 16:29 UTC (permalink / raw)
  To: Wolfram Sang
  Cc: linux-renesas-soc, Thanh Quan, Magnus Damm, Rob Herring,
	Krzysztof Kozlowski, devicetree, linux-kernel

On Fri, Nov 4, 2022 at 4:11 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> From: Thanh Quan <thanh.quan.xn@renesas.com>
>
> Signed-off-by: Thanh Quan <thanh.quan.xn@renesas.com>
> [wsa: merged the fixes into this one and rebased]
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in renesas-devel for v6.2.

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] 6+ messages in thread

end of thread, other threads:[~2022-11-07 16:31 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-04 15:11 [PATCH 0/3] r8a779g0: add TMU support Wolfram Sang
2022-11-04 15:11 ` [PATCH 1/3] clk: renesas: r8a779g0: Add CMT clocks Wolfram Sang
2022-11-07 16:27   ` Geert Uytterhoeven
2022-11-04 15:11 ` [PATCH 2/3] arm64: dts: renesas: r8a779g0: Add CMT node Wolfram Sang
2022-11-07 16:29   ` Geert Uytterhoeven
2022-11-04 15:11 ` [PATCH 3/3] TEST: arm64: dts: renesas: white-hawk-cpu: Enable CMT Wolfram Sang

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