[PATCH v2 0/3] Add R-Car gen3 SoC support to the CMT driver

[PATCH v2 0/3] Add R-Car gen3 SoC support to the CMT driver

[Sergei Shtylyov]

Hello!

Here's the set of 3 patches against the 'tip.git' repo's 'timers/core' branch
plus the CMT driver fixups for the 32/64-bit machines posted recently. We're
adding support for the CMT types0/1 found in the R-Car gen3 SoCs.

[1/3] clocksource: sh_cmt: properly line-wrap sh_cmt_of_table[] initializer
[2/3] dt-bindings: timer: renesas: cmt: document R-Car gen3 support
[3/3] clocksource: sh_cmt: add R-Car gen3 support

MBR, Sergei

[PATCH v2 0/3] Add R-Car gen3 SoC support to the CMT driver

[Sergei Shtylyov]

Hello!

Here's the set of 3 patches against the 'tip.git' repo's 'timers/core' branch
plus the CMT driver fixups for the 32/64-bit machines posted recently. We're
adding support for the CMT types0/1 found in the R-Car gen3 SoCs.

[1/3] clocksource: sh_cmt: properly line-wrap sh_cmt_of_table[] initializer
[2/3] dt-bindings: timer: renesas: cmt: document R-Car gen3 support
[3/3] clocksource: sh_cmt: add R-Car gen3 support

MBR, Sergei

[PATCH v2 1/3] clocksource: sh_cmt: properly line-wrap sh_cmt_of_table[] initializer

[Sergei Shtylyov]

There's no good reason for the sh_cmt_of_table[] initializer to
violate the 80-column limit, especially after the commit 8d50e9476bb4
("clocksource/drivers/sh_cmt: Mark "renesas,cmt-48-gen2" deprecated")
partially fixed it -- fix the R-Car gen2 related entries as well.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Chris Paterson <chris.paterson2@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

---
Changes in version 2:
- refreshed the patch;
- added Chris' and Geert's tags.

 drivers/clocksource/sh_cmt.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Index: tip/drivers/clocksource/sh_cmt.c
===================================================================
--- tip.orig/drivers/clocksource/sh_cmt.c
+++ tip/drivers/clocksource/sh_cmt.c
@@ -935,8 +935,14 @@ static const struct of_device_id sh_cmt_
 		.compatible = "renesas,cmt-48-gen2",
 		.data = &sh_cmt_info[SH_CMT0_RCAR_GEN2]
 	},
-	{ .compatible = "renesas,rcar-gen2-cmt0", .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2] },
-	{ .compatible = "renesas,rcar-gen2-cmt1", .data = &sh_cmt_info[SH_CMT1_RCAR_GEN2] },
+	{
+		.compatible = "renesas,rcar-gen2-cmt0",
+		.data = &sh_cmt_info[SH_CMT0_RCAR_GEN2]
+	},
+	{
+		.compatible = "renesas,rcar-gen2-cmt1",
+		.data = &sh_cmt_info[SH_CMT1_RCAR_GEN2]
+	},
 	{ }
 };
 MODULE_DEVICE_TABLE(of, sh_cmt_of_table);

[PATCH v2 2/3] dt-bindings: timer: renesas: cmt: document R-Car gen3 support

[Sergei Shtylyov]

Document support for the R-Car gen3 CMT types 0/1 bindings -- they seem
to be the same CMT types 0/1 as in the R-Car gen2 SoCs.

Also document R8A779{7|8}0 bindings as these are the R-Car gen3 SoCs for
which the initial support was done.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
Changes in version 2:
- new patch, split from the next one.

 Documentation/devicetree/bindings/timer/renesas,cmt.txt |    7 +++++++
 1 file changed, 7 insertions(+)

Index: tip/Documentation/devicetree/bindings/timer/renesas,cmt.txt
===================================================================
--- tip.orig/Documentation/devicetree/bindings/timer/renesas,cmt.txt
+++ tip/Documentation/devicetree/bindings/timer/renesas,cmt.txt
@@ -34,6 +34,10 @@ Required Properties:
     - "renesas,r8a7793-cmt1" for the 48-bit CMT1 device included in r8a7793.
     - "renesas,r8a7794-cmt0" for the 32-bit CMT0 device included in r8a7794.
     - "renesas,r8a7794-cmt1" for the 48-bit CMT1 device included in r8a7794.
+    - "renesas,r8a77970-cmt0" for the 32-bit CMT0 device included in r8a77970.
+    - "renesas,r8a77970-cmt1" for the 48-bit CMT1 device included in r8a77970.
+    - "renesas,r8a77980-cmt0" for the 32-bit CMT0 device included in r8a77980.
+    - "renesas,r8a77980-cmt1" for the 48-bit CMT1 device included in r8a77980.
 
     - "renesas,rcar-gen2-cmt0" for 32-bit CMT0 devices included in R-Car Gen2
 		and RZ/G1.
@@ -41,6 +45,9 @@ Required Properties:
 		and RZ/G1.
 		These are fallbacks for r8a73a4, R-Car Gen2 and RZ/G1 entries
 		listed above.
+    - "renesas,rcar-gen3-cmt0" for 32-bit CMT0 devices included in R-Car Gen3.
+    - "renesas,rcar-gen3-cmt1" for 48-bit CMT1 devices included in R-Car Gen3.
+		These are fallbacks for R-Car Gen3 entries listed above.
 
   - reg: base address and length of the registers block for the timer module.
   - interrupts: interrupt-specifier for the timer, one per channel.

[PATCH v2 3/3] clocksource: sh_cmt: add R-Car gen3 support

[Sergei Shtylyov]

Add support for the R-Car gen3 CMT types 0/1 -- they seem to be the same
CMT types 0/1 as in R-Car gen2 SoCs.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
Changes in version 2:
- split the bindings update into a separate patch. 

 drivers/clocksource/sh_cmt.c |    8 ++++++++
 1 file changed, 8 insertions(+)

Index: tip/drivers/clocksource/sh_cmt.c
===================================================================
--- tip.orig/drivers/clocksource/sh_cmt.c
+++ tip/drivers/clocksource/sh_cmt.c
@@ -943,6 +943,14 @@ static const struct of_device_id sh_cmt_
 		.compatible = "renesas,rcar-gen2-cmt1",
 		.data = &sh_cmt_info[SH_CMT1_RCAR_GEN2]
 	},
+	{
+		.compatible = "renesas,rcar-gen3-cmt0",
+		.data = &sh_cmt_info[SH_CMT0_RCAR_GEN2]
+	},
+	{
+		.compatible = "renesas,rcar-gen3-cmt1",
+		.data = &sh_cmt_info[SH_CMT1_RCAR_GEN2]
+	},
 	{ }
 };
 MODULE_DEVICE_TABLE(of, sh_cmt_of_table);

Re: [PATCH v2 2/3] dt-bindings: timer: renesas: cmt: document R-Car gen3 support

[Geert Uytterhoeven]

On Wed, Sep 12, 2018 at 10:16 PM Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> Document support for the R-Car gen3 CMT types 0/1 bindings -- they seem
> to be the same CMT types 0/1 as in the R-Car gen2 SoCs.
>
> Also document R8A779{7|8}0 bindings as these are the R-Car gen3 SoCs for
> which the initial support was done.
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

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 v2 3/3] clocksource: sh_cmt: add R-Car gen3 support

[Geert Uytterhoeven]

On Wed, Sep 12, 2018 at 10:17 PM Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> Add support for the R-Car gen3 CMT types 0/1 -- they seem to be the same
> CMT types 0/1 as in R-Car gen2 SoCs.
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

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 v2 0/3] Add R-Car gen3 SoC support to the CMT driver

[Daniel Lezcano]

On 12/09/2018 22:10, Sergei Shtylyov wrote:
> Hello!
> 
> Here's the set of 3 patches against the 'tip.git' repo's 'timers/core' branch
> plus the CMT driver fixups for the 32/64-bit machines posted recently. We're
> adding support for the CMT types0/1 found in the R-Car gen3 SoCs.
> 
> [1/3] clocksource: sh_cmt: properly line-wrap sh_cmt_of_table[] initializer
> [2/3] dt-bindings: timer: renesas: cmt: document R-Car gen3 support
> [3/3] clocksource: sh_cmt: add R-Car gen3 support

Applied for 4.20, thanks.

-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: [PATCH v2 0/3] Add R-Car gen3 SoC support to the CMT driver

[Daniel Lezcano]

On 12/09/2018 22:10, Sergei Shtylyov wrote:
> Hello!
> 
> Here's the set of 3 patches against the 'tip.git' repo's 'timers/core' branch
> plus the CMT driver fixups for the 32/64-bit machines posted recently. We're
> adding support for the CMT types0/1 found in the R-Car gen3 SoCs.
> 
> [1/3] clocksource: sh_cmt: properly line-wrap sh_cmt_of_table[] initializer
> [2/3] dt-bindings: timer: renesas: cmt: document R-Car gen3 support
> [3/3] clocksource: sh_cmt: add R-Car gen3 support

Applied for 4.20, thanks.

-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

Re: [PATCH v2 1/3] clocksource: sh_cmt: properly line-wrap sh_cmt_of_table[] initializer

[Simon Horman]

On Wed, Sep 12, 2018 at 11:14:14PM +0300, Sergei Shtylyov wrote:
> There's no good reason for the sh_cmt_of_table[] initializer to
> violate the 80-column limit, especially after the commit 8d50e9476bb4
> ("clocksource/drivers/sh_cmt: Mark "renesas,cmt-48-gen2" deprecated")
> partially fixed it -- fix the R-Car gen2 related entries as well.
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Reviewed-by: Chris Paterson <chris.paterson2@renesas.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Reviewed-by: Simon Horman <horms+renesas@verge.net.au>

> 
> ---
> Changes in version 2:
> - refreshed the patch;
> - added Chris' and Geert's tags.
> 
>  drivers/clocksource/sh_cmt.c |   10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> Index: tip/drivers/clocksource/sh_cmt.c
> ===================================================================
> --- tip.orig/drivers/clocksource/sh_cmt.c
> +++ tip/drivers/clocksource/sh_cmt.c
> @@ -935,8 +935,14 @@ static const struct of_device_id sh_cmt_
>  		.compatible = "renesas,cmt-48-gen2",
>  		.data = &sh_cmt_info[SH_CMT0_RCAR_GEN2]
>  	},
> -	{ .compatible = "renesas,rcar-gen2-cmt0", .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2] },
> -	{ .compatible = "renesas,rcar-gen2-cmt1", .data = &sh_cmt_info[SH_CMT1_RCAR_GEN2] },
> +	{
> +		.compatible = "renesas,rcar-gen2-cmt0",
> +		.data = &sh_cmt_info[SH_CMT0_RCAR_GEN2]
> +	},
> +	{
> +		.compatible = "renesas,rcar-gen2-cmt1",
> +		.data = &sh_cmt_info[SH_CMT1_RCAR_GEN2]
> +	},
>  	{ }
>  };
>  MODULE_DEVICE_TABLE(of, sh_cmt_of_table);
> 

Re: [PATCH v2 2/3] dt-bindings: timer: renesas: cmt: document R-Car gen3 support

[Simon Horman]

On Wed, Sep 12, 2018 at 11:15:28PM +0300, Sergei Shtylyov wrote:
> Document support for the R-Car gen3 CMT types 0/1 bindings -- they seem
> to be the same CMT types 0/1 as in the R-Car gen2 SoCs.
> 
> Also document R8A779{7|8}0 bindings as these are the R-Car gen3 SoCs for
> which the initial support was done.
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Reviewed-by: Simon Horman <horms+renesas@verge.net.au>

Re: [PATCH v2 3/3] clocksource: sh_cmt: add R-Car gen3 support

[Simon Horman]

On Wed, Sep 12, 2018 at 11:17:37PM +0300, Sergei Shtylyov wrote:
> Add support for the R-Car gen3 CMT types 0/1 -- they seem to be the same
> CMT types 0/1 as in R-Car gen2 SoCs.
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

Reviewed-by: Simon Horman <horms+renesas@verge.net.au>