[PATCH v2 0/2] treewide: Add CAN support for r8a77961

[PATCH v2 0/2] treewide: Add CAN support for r8a77961

[Yoshihiro Shimoda]

This patch series is based on renesas-drivers-2021-02-16-v5.11 tag.
And, Goda-san tested this patch series on R-Car M3-W+ StarterKit board
with Kingfisher. (Thank you Goda-san!)

Changes from v1:
 - In patch 1/2
 -- Add R8A77961 to the paragraph about required properties.
 -- Update "R8A7796" to "R8A77960". And add a description for this.
 - In patch 2/2
 -- Add Reviewed-by from Geert-san.
 https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=446721

Yoshihiro Shimoda (2):
  dt-bindings: net: can: rcar_can: Document r8a77961 support
  arm64: dts: renesas: r8a77961: Add CAN nodes

 .../devicetree/bindings/net/can/rcar_can.txt  |  5 ++--
 arch/arm64/boot/dts/renesas/r8a77961.dtsi     | 26 +++++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

-- 
2.25.1

[PATCH v2 1/2] dt-bindings: net: can: rcar_can: Document r8a77961 support

[Yoshihiro Shimoda]

Document SoC specific bindings for R-Car M3-W+ (r8a77961) SoC.

Also as R8A7796 is now called R8A77960 so that update those
references.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 Documentation/devicetree/bindings/net/can/rcar_can.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/can/rcar_can.txt b/Documentation/devicetree/bindings/net/can/rcar_can.txt
index 6a5956347816..90ac4fef23f5 100644
--- a/Documentation/devicetree/bindings/net/can/rcar_can.txt
+++ b/Documentation/devicetree/bindings/net/can/rcar_can.txt
@@ -19,7 +19,8 @@ Required properties:
 	      "renesas,can-r8a7793" if CAN controller is a part of R8A7793 SoC.
 	      "renesas,can-r8a7794" if CAN controller is a part of R8A7794 SoC.
 	      "renesas,can-r8a7795" if CAN controller is a part of R8A7795 SoC.
-	      "renesas,can-r8a7796" if CAN controller is a part of R8A7796 SoC.
+	      "renesas,can-r8a7796" if CAN controller is a part of R8A77960 SoC.
+	      "renesas,can-r8a77961" if CAN controller is a part of R8A77961 SoC.
 	      "renesas,can-r8a77965" if CAN controller is a part of R8A77965 SoC.
 	      "renesas,can-r8a77990" if CAN controller is a part of R8A77990 SoC.
 	      "renesas,can-r8a77995" if CAN controller is a part of R8A77995 SoC.
@@ -40,7 +41,7 @@ Required properties:
 - pinctrl-names: must be "default".
 
 Required properties for R8A774A1, R8A774B1, R8A774C0, R8A774E1, R8A7795,
-R8A7796, R8A77965, R8A77990, and R8A77995:
+R8A77960, R8A77961, R8A77965, R8A77990, and R8A77995:
 For the denoted SoCs, "clkp2" can be CANFD clock. This is a div6 clock and can
 be used by both CAN and CAN FD controller at the same time. It needs to be
 scaled to maximum frequency if any of these controllers use it. This is done
-- 
2.25.1

[PATCH v2 2/2] arm64: dts: renesas: r8a77961: Add CAN nodes

[Yoshihiro Shimoda]

Add the device nodes for all CAN nodes on R-Car M3-W+.

Tested-by: Yusuke Goda <yusuke.goda.sx@renesas.com>
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm64/boot/dts/renesas/r8a77961.dtsi | 26 +++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a77961.dtsi b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
index e8c31ebec097..d44b7fef1e8e 100644
--- a/arch/arm64/boot/dts/renesas/r8a77961.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77961.dtsi
@@ -1155,13 +1155,35 @@ avb: ethernet@e6800000 {
 		};
 
 		can0: can@e6c30000 {
+			compatible = "renesas,can-r8a77961",
+				     "renesas,rcar-gen3-can";
 			reg = <0 0xe6c30000 0 0x1000>;
-			/* placeholder */
+			interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 916>,
+			       <&cpg CPG_CORE R8A77961_CLK_CANFD>,
+			       <&can_clk>;
+			clock-names = "clkp1", "clkp2", "can_clk";
+			assigned-clocks = <&cpg CPG_CORE R8A77961_CLK_CANFD>;
+			assigned-clock-rates = <40000000>;
+			power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
+			resets = <&cpg 916>;
+			status = "disabled";
 		};
 
 		can1: can@e6c38000 {
+			compatible = "renesas,can-r8a77961",
+				     "renesas,rcar-gen3-can";
 			reg = <0 0xe6c38000 0 0x1000>;
-			/* placeholder */
+			interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 915>,
+			       <&cpg CPG_CORE R8A77961_CLK_CANFD>,
+			       <&can_clk>;
+			clock-names = "clkp1", "clkp2", "can_clk";
+			assigned-clocks = <&cpg CPG_CORE R8A77961_CLK_CANFD>;
+			assigned-clock-rates = <40000000>;
+			power-domains = <&sysc R8A77961_PD_ALWAYS_ON>;
+			resets = <&cpg 915>;
+			status = "disabled";
 		};
 
 		pwm0: pwm@e6e30000 {
-- 
2.25.1

Re: [PATCH v2 1/2] dt-bindings: net: can: rcar_can: Document r8a77961 support

[Geert Uytterhoeven]

On Fri, Mar 12, 2021 at 10:50 AM Yoshihiro Shimoda
<yoshihiro.shimoda.uh@renesas.com> wrote:
> Document SoC specific bindings for R-Car M3-W+ (r8a77961) SoC.
>
> Also as R8A7796 is now called R8A77960 so that update those
> references.
>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.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 1/2] dt-bindings: net: can: rcar_can: Document r8a77961 support

[Rob Herring]

On Fri, 12 Mar 2021 18:50:29 +0900, Yoshihiro Shimoda wrote:
> Document SoC specific bindings for R-Car M3-W+ (r8a77961) SoC.
> 
> Also as R8A7796 is now called R8A77960 so that update those
> references.
> 
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> ---
>  Documentation/devicetree/bindings/net/can/rcar_can.txt | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 

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

Re: [PATCH v2 1/2] dt-bindings: net: can: rcar_can: Document r8a77961 support

[Wolfram Sang]

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

On Fri, Mar 12, 2021 at 06:50:29PM +0900, Yoshihiro Shimoda wrote:
> Document SoC specific bindings for R-Car M3-W+ (r8a77961) SoC.
> 
> Also as R8A7796 is now called R8A77960 so that update those
> references.
> 
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

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


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

Re: [PATCH v2 1/2] dt-bindings: net: can: rcar_can: Document r8a77961 support

[Wolfram Sang]

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

On Fri, Mar 12, 2021 at 06:50:29PM +0900, Yoshihiro Shimoda wrote:
> Document SoC specific bindings for R-Car M3-W+ (r8a77961) SoC.
> 
> Also as R8A7796 is now called R8A77960 so that update those
> references.
> 
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Acked-by: Rob Herring <robh@kernel.org>

Shimoda-san, I think you should resend this and add netdev and
linux-can@vger.kernel.org to Cc. I'd think the CAN maintainers will pick
this up.


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

RE: [PATCH v2 1/2] dt-bindings: net: can: rcar_can: Document r8a77961 support

[Yoshihiro Shimoda]

Hi Wolfram-san,

> From: Wolfram Sang, Sent: Thursday, April 8, 2021 11:22 PM
> 
> On Fri, Mar 12, 2021 at 06:50:29PM +0900, Yoshihiro Shimoda wrote:
> > Document SoC specific bindings for R-Car M3-W+ (r8a77961) SoC.
> >
> > Also as R8A7796 is now called R8A77960 so that update those
> > references.
> >
> > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > Acked-by: Rob Herring <robh@kernel.org>
> 
> Shimoda-san, I think you should resend this and add netdev and
> linux-can@vger.kernel.org to Cc. I'd think the CAN maintainers will pick
> this up.

Thank you very much for your comment! I'll resend this patch
with adding netdev and linux-can ML.

Best regards,
Yoshihiro Shimoda