[PATCH 0/3] ARM: dts: Minor CMT update for 32-bit ARM SoCs

[PATCH 0/3] ARM: dts: Minor CMT update for 32-bit ARM SoCs

[Magnus Damm]

ARM: dts: Minor CMT update for 32-bit ARM SoCs

[PATCH 1/3] ARM: dts: Update CMT1 DT compat strings on r8a7740
[PATCH 2/3] ARM: dts: Update CMT1 DT compat strings on sh73a0
[PATCH 3/3] ARM: dts: Add CMT0 and CMT1 to r8a7792

These patches modify CMT device support on r8a7740, sh73a0 and r8a7792.
In particular r8a7740 and sh73a0 get their DT compat strings updated
and r8a7792 gets a fresh set of CMT devices.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---

Patch 1 and Patch 2 depend on the following DT binding change:
[PATCH 2/8] dt-bindings: timer: renesas, cmt: Update CMT1 on sh73a0 and r8a7740

 arch/arm/boot/dts/r8a7740.dtsi |    2 +-
 arch/arm/boot/dts/r8a7792.dtsi |   34 ++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/sh73a0.dtsi  |    2 +-
 3 files changed, 36 insertions(+), 2 deletions(-)

[PATCH 1/3] ARM: dts: Update CMT1 DT compat strings on r8a7740

[Magnus Damm]

From: Magnus Damm <damm+renesas@opensource.se>

Update the r8a7740 to use the CMT1 DT compat string documented in:
[PATCH 2/8] dt-bindings: timer: renesas, cmt: Update CMT1 on sh73a0 and r8a7740

The "renesas,cmt-48" portion is left as-is to avoid breakage until the CMT
driver has been updated to make use of the new DT compat strings.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---

 arch/arm/boot/dts/r8a7740.dtsi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- 0001/arch/arm/boot/dts/r8a7740.dtsi
+++ work/arch/arm/boot/dts/r8a7740.dtsi	2019-06-17 14:21:14.647792561 +0900
@@ -83,7 +83,7 @@
 	};
 
 	cmt1: timer@e6138000 {
-		compatible = "renesas,cmt-48-r8a7740", "renesas,cmt-48";
+		compatible = "renesas,r8a7740-cmt1", "renesas,cmt-48";
 		reg = <0xe6138000 0x170>;
 		interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp3_clks R8A7740_CLK_CMT1>;

[PATCH 2/3] ARM: dts: Update CMT1 DT compat strings on sh73a0

[Magnus Damm]

From: Magnus Damm <damm+renesas@opensource.se>

Update the sh73a0 to use the CMT1 DT compat string documented in:
[PATCH 2/8] dt-bindings: timer: renesas, cmt: Update CMT1 on sh73a0 and r8a7740

The "renesas,cmt-48" portion is left as-is to avoid breakage until the CMT
driver has been updated to make use of the new DT compat strings.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---

 arch/arm/boot/dts/sh73a0.dtsi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- 0001/arch/arm/boot/dts/sh73a0.dtsi
+++ work/arch/arm/boot/dts/sh73a0.dtsi	2019-06-17 14:23:20.096369624 +0900
@@ -92,7 +92,7 @@
 	};
 
 	cmt1: timer@e6138000 {
-		compatible = "renesas,cmt-48-sh73a0", "renesas,cmt-48";
+		compatible = "renesas,sh73a0-cmt1", "renesas,cmt-48";
 		reg = <0xe6138000 0x200>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp3_clks SH73A0_CLK_CMT1>;

[PATCH 3/3] ARM: dts: Add CMT0 and CMT1 to r8a7792

[Magnus Damm]

From: Magnus Damm <damm+renesas@opensource.se>

Add CMT0 and CMT1 to the R-Car Gen2 V2H (r8a7792) SoC.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---

 arch/arm/boot/dts/r8a7792.dtsi |   34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

--- 0001/arch/arm/boot/dts/r8a7792.dtsi
+++ work/arch/arm/boot/dts/r8a7792.dtsi	2019-06-17 14:28:36.306948031 +0900
@@ -875,6 +875,40 @@
 			compatible = "renesas,prr";
 			reg = <0 0xff000044 0 4>;
 		};
+
+		cmt0: timer@ffca0000 {
+			compatible = "renesas,r8a7792-cmt0",
+				     "renesas,rcar-gen2-cmt0";
+			reg = <0 0xffca0000 0 0x1004>;
+			interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 124>;
+			clock-names = "fck";
+			power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+			resets = <&cpg 124>;
+
+			status = "disabled";
+		};
+
+		cmt1: timer@e6130000 {
+			compatible = "renesas,r8a7792-cmt1",
+				     "renesas,rcar-gen2-cmt1";
+			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 = <&cpg CPG_MOD 329>;
+			clock-names = "fck";
+			power-domains = <&sysc R8A7792_PD_ALWAYS_ON>;
+			resets = <&cpg 329>;
+
+			status = "disabled";
+		};
 	};
 
 	timer {

Re: [PATCH 0/3] ARM: dts: Minor CMT update for 32-bit ARM SoCs

[Simon Horman]

On Mon, Jun 17, 2019 at 06:16:42PM +0900, Magnus Damm wrote:
> ARM: dts: Minor CMT update for 32-bit ARM SoCs
> 
> [PATCH 1/3] ARM: dts: Update CMT1 DT compat strings on r8a7740
> [PATCH 2/3] ARM: dts: Update CMT1 DT compat strings on sh73a0
> [PATCH 3/3] ARM: dts: Add CMT0 and CMT1 to r8a7792
> 
> These patches modify CMT device support on r8a7740, sh73a0 and r8a7792.
> In particular r8a7740 and sh73a0 get their DT compat strings updated
> and r8a7792 gets a fresh set of CMT devices.
> 
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> ---
> 
> Patch 1 and Patch 2 depend on the following DT binding change:
> [PATCH 2/8] dt-bindings: timer: renesas, cmt: Update CMT1 on sh73a0 and r8a7740

Hi Magnus,

Do these also depend on a driver update to avoid a regression?

Re: [PATCH 0/3] ARM: dts: Minor CMT update for 32-bit ARM SoCs

[Magnus Damm]

On Tue, Jun 18, 2019 at 7:46 PM Simon Horman <horms@verge.net.au> wrote:
>
> On Mon, Jun 17, 2019 at 06:16:42PM +0900, Magnus Damm wrote:
> > ARM: dts: Minor CMT update for 32-bit ARM SoCs
> >
> > [PATCH 1/3] ARM: dts: Update CMT1 DT compat strings on r8a7740
> > [PATCH 2/3] ARM: dts: Update CMT1 DT compat strings on sh73a0
> > [PATCH 3/3] ARM: dts: Add CMT0 and CMT1 to r8a7792
> >
> > These patches modify CMT device support on r8a7740, sh73a0 and r8a7792.
> > In particular r8a7740 and sh73a0 get their DT compat strings updated
> > and r8a7792 gets a fresh set of CMT devices.
> >
> > Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> > ---
> >
> > Patch 1 and Patch 2 depend on the following DT binding change:
> > [PATCH 2/8] dt-bindings: timer: renesas, cmt: Update CMT1 on sh73a0 and r8a7740
>
> Hi Magnus,
>
> Do these also depend on a driver update to avoid a regression?

Hi Simon,

Nope, there are no driver dependencies for this series!

Thanks for your help,

/ magnus

Re: [PATCH 3/3] ARM: dts: Add CMT0 and CMT1 to r8a7792

[Geert Uytterhoeven]

On Mon, Jun 17, 2019 at 11:17 AM Magnus Damm <magnus.damm@gmail.com> wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
>
> Add CMT0 and CMT1 to the R-Car Gen2 V2H (r8a7792) SoC.
>
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

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] ARM: dts: Update CMT1 DT compat strings on r8a7740

[Geert Uytterhoeven]

Hi Magnus,

On Mon, Jun 17, 2019 at 11:16 AM Magnus Damm <magnus.damm@gmail.com> wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
>
> Update the r8a7740 to use the CMT1 DT compat string documented in:
> [PATCH 2/8] dt-bindings: timer: renesas, cmt: Update CMT1 on sh73a0 and r8a7740
>
> The "renesas,cmt-48" portion is left as-is to avoid breakage until the CMT
> driver has been updated to make use of the new DT compat strings.

Hence wouldn't it be better to update the driver first, and the DTS in
the next release, so you can remove the "renesas,cmt-48" portion with
the single DTS update?

This is how it was done for R-Car Gen2:

v4.15 has commit 83c79a6d8d7f4821 ("clocksource/drivers/sh_cmt: Support
separate R-Car Gen2 CMT0/1"),
v4.16 has commit bf50e0ab4f5062bb ("ARM: dts: r8a7791: Update CMT compat
strings").

> --- 0001/arch/arm/boot/dts/r8a7740.dtsi
> +++ work/arch/arm/boot/dts/r8a7740.dtsi 2019-06-17 14:21:14.647792561 +0900
> @@ -83,7 +83,7 @@
>         };
>
>         cmt1: timer@e6138000 {
> -               compatible = "renesas,cmt-48-r8a7740", "renesas,cmt-48";
> +               compatible = "renesas,r8a7740-cmt1", "renesas,cmt-48";
>                 reg = <0xe6138000 0x170>;
>                 interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
>                 clocks = <&mstp3_clks R8A7740_CLK_CMT1>;

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] ARM: dts: Update CMT1 DT compat strings on r8a7740

[Magnus Damm]

Hi Geert,

On Tue, Jun 18, 2019 at 11:08 PM Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
>
> Hi Magnus,
>
> On Mon, Jun 17, 2019 at 11:16 AM Magnus Damm <magnus.damm@gmail.com> wrote:
> > From: Magnus Damm <damm+renesas@opensource.se>
> >
> > Update the r8a7740 to use the CMT1 DT compat string documented in:
> > [PATCH 2/8] dt-bindings: timer: renesas, cmt: Update CMT1 on sh73a0 and r8a7740
> >
> > The "renesas,cmt-48" portion is left as-is to avoid breakage until the CMT
> > driver has been updated to make use of the new DT compat strings.
>
> Hence wouldn't it be better to update the driver first, and the DTS in
> the next release, so you can remove the "renesas,cmt-48" portion with
> the single DTS update?

Changing the DTS once sounds nice indeed. I guess my current series
are optimized for easy merge of DT Binding docs and DTS. The driver
changes are considered slow path.

Regarding the driver itself, I was under the impression that
introducing new DT compat strings is often disconnected from removing
old DT compat strings. Do you agree?

This is how I understand your proposed order:

Step 1:
- Update DT binding document to include new compat strings, remove
deprecated compat strings
- Add new DT compat string matching code to the driver
- Mark old DT compat strings in driver as deprecated

Step 2: (Any time after step 1 is complete)
- Convert DTS to use DT new compat strings

Step 3: (After N releases or years)
- Remove deprecated DT compat string matching code in driver

> This is how it was done for R-Car Gen2:
>
> v4.15 has commit 83c79a6d8d7f4821 ("clocksource/drivers/sh_cmt: Support
> separate R-Car Gen2 CMT0/1"),
> v4.16 has commit bf50e0ab4f5062bb ("ARM: dts: r8a7791: Update CMT compat
> strings").

Looking good!

Thanks for your help!

/ magnus

Re: [PATCH 1/3] ARM: dts: Update CMT1 DT compat strings on r8a7740

[Geert Uytterhoeven]

Hi Magnus,

On Tue, Jun 18, 2019 at 5:06 PM Magnus Damm <magnus.damm@gmail.com> wrote:
> On Tue, Jun 18, 2019 at 11:08 PM Geert Uytterhoeven
> <geert@linux-m68k.org> wrote:
> > On Mon, Jun 17, 2019 at 11:16 AM Magnus Damm <magnus.damm@gmail.com> wrote:
> > > From: Magnus Damm <damm+renesas@opensource.se>
> > >
> > > Update the r8a7740 to use the CMT1 DT compat string documented in:
> > > [PATCH 2/8] dt-bindings: timer: renesas, cmt: Update CMT1 on sh73a0 and r8a7740
> > >
> > > The "renesas,cmt-48" portion is left as-is to avoid breakage until the CMT
> > > driver has been updated to make use of the new DT compat strings.
> >
> > Hence wouldn't it be better to update the driver first, and the DTS in
> > the next release, so you can remove the "renesas,cmt-48" portion with
> > the single DTS update?
>
> Changing the DTS once sounds nice indeed. I guess my current series
> are optimized for easy merge of DT Binding docs and DTS. The driver
> changes are considered slow path.
>
> Regarding the driver itself, I was under the impression that
> introducing new DT compat strings is often disconnected from removing
> old DT compat strings. Do you agree?

Yes, you have to add a safety period before removing them.

> This is how I understand your proposed order:
>
> Step 1:
> - Update DT binding document to include new compat strings, remove
> deprecated compat strings
> - Add new DT compat string matching code to the driver
> - Mark old DT compat strings in driver as deprecated
>
> Step 2: (Any time after step 1 is complete)
> - Convert DTS to use DT new compat strings
>
> Step 3: (After N releases or years)
> - Remove deprecated DT compat string matching code in driver

Exactly.
Thanks!

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 3/3] ARM: dts: Add CMT0 and CMT1 to r8a7792

[Simon Horman]

On Tue, Jun 18, 2019 at 03:54:29PM +0200, Geert Uytterhoeven wrote:
> On Mon, Jun 17, 2019 at 11:17 AM Magnus Damm <magnus.damm@gmail.com> wrote:
> > From: Magnus Damm <damm+renesas@opensource.se>
> >
> > Add CMT0 and CMT1 to the R-Car Gen2 V2H (r8a7792) SoC.
> >
> > Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> 
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Thanks, applied for inclusion in v5.3.

Re: [PATCH 1/3] ARM: dts: Update CMT1 DT compat strings on r8a7740

[Simon Horman]

On Tue, Jun 18, 2019 at 05:12:35PM +0200, Geert Uytterhoeven wrote:
> Hi Magnus,
> 
> On Tue, Jun 18, 2019 at 5:06 PM Magnus Damm <magnus.damm@gmail.com> wrote:
> > On Tue, Jun 18, 2019 at 11:08 PM Geert Uytterhoeven
> > <geert@linux-m68k.org> wrote:
> > > On Mon, Jun 17, 2019 at 11:16 AM Magnus Damm <magnus.damm@gmail.com> wrote:
> > > > From: Magnus Damm <damm+renesas@opensource.se>
> > > >
> > > > Update the r8a7740 to use the CMT1 DT compat string documented in:
> > > > [PATCH 2/8] dt-bindings: timer: renesas, cmt: Update CMT1 on sh73a0 and r8a7740
> > > >
> > > > The "renesas,cmt-48" portion is left as-is to avoid breakage until the CMT
> > > > driver has been updated to make use of the new DT compat strings.
> > >
> > > Hence wouldn't it be better to update the driver first, and the DTS in
> > > the next release, so you can remove the "renesas,cmt-48" portion with
> > > the single DTS update?
> >
> > Changing the DTS once sounds nice indeed. I guess my current series
> > are optimized for easy merge of DT Binding docs and DTS. The driver
> > changes are considered slow path.
> >
> > Regarding the driver itself, I was under the impression that
> > introducing new DT compat strings is often disconnected from removing
> > old DT compat strings. Do you agree?
> 
> Yes, you have to add a safety period before removing them.
> 
> > This is how I understand your proposed order:
> >
> > Step 1:
> > - Update DT binding document to include new compat strings, remove
> > deprecated compat strings
> > - Add new DT compat string matching code to the driver
> > - Mark old DT compat strings in driver as deprecated
> >
> > Step 2: (Any time after step 1 is complete)
> > - Convert DTS to use DT new compat strings
> >
> > Step 3: (After N releases or years)
> > - Remove deprecated DT compat string matching code in driver
> 
> Exactly.
> Thanks!

Likewise, thanks.

I am marking patches 1/3 and 2/3 as deferred pending the completion
of step 1.