diff mbox series

[10/11] arm64: dts: renesas: r8a774c0: Add clkp2 clock to CAN nodes

Message ID 1547663874-29411-11-git-send-email-fabrizio.castro@bp.renesas.com
State Not Applicable
Delegated to: David Miller
Headers show
Series Add basic EK874 support | expand

Commit Message

Fabrizio Castro Jan. 16, 2019, 6:37 p.m. UTC 
According to the latest information, clkp2 is available on RZ/G2.
Modify CAN0 and CAN1 nodes accordingly.

Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
Reviewed-by: Chris Paterson <Chris.Paterson2@renesas.com>
---
 arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Comments

Simon Horman Jan. 17, 2019, 12:05 p.m. UTC | #1 
On Wed, Jan 16, 2019 at 06:37:53PM +0000, Fabrizio Castro wrote:
> According to the latest information, clkp2 is available on RZ/G2.
> Modify CAN0 and CAN1 nodes accordingly.
> 
> Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> Reviewed-by: Chris Paterson <Chris.Paterson2@renesas.com>

Taking your word for the motivation for this change,
this patch seems fine to me but I would like to wait for review
from others.

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

> ---
>  arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> index 3970aaf..326ab3a 100644
> --- a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> @@ -809,8 +809,10 @@
>  				     "renesas,rcar-gen3-can";
>  			reg = <0 0xe6c30000 0 0x1000>;
>  			interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
> -			clocks = <&cpg CPG_MOD 916>, <&can_clk>;
> -			clock-names = "clkp1", "can_clk";
> +			clocks = <&cpg CPG_MOD 916>,
> +				 <&cpg CPG_CORE R8A774C0_CLK_CANFD>,
> +				 <&can_clk>;
> +			clock-names = "clkp1", "clkp2", "can_clk";
>  			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
>  			resets = <&cpg 916>;
>  			status = "disabled";
> @@ -821,8 +823,10 @@
>  				     "renesas,rcar-gen3-can";
>  			reg = <0 0xe6c38000 0 0x1000>;
>  			interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
> -			clocks = <&cpg CPG_MOD 915>, <&can_clk>;
> -			clock-names = "clkp1", "can_clk";
> +			clocks = <&cpg CPG_MOD 915>,
> +				 <&cpg CPG_CORE R8A774C0_CLK_CANFD>,
> +				 <&can_clk>;
> +			clock-names = "clkp1", "clkp2", "can_clk";
>  			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
>  			resets = <&cpg 915>;
>  			status = "disabled";
> -- 
> 2.7.4
>
Simon Horman Jan. 28, 2019, 1:02 p.m. UTC | #2 
On Thu, Jan 17, 2019 at 01:05:42PM +0100, Simon Horman wrote:
> On Wed, Jan 16, 2019 at 06:37:53PM +0000, Fabrizio Castro wrote:
> > According to the latest information, clkp2 is available on RZ/G2.
> > Modify CAN0 and CAN1 nodes accordingly.
> > 
> > Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> > Reviewed-by: Chris Paterson <Chris.Paterson2@renesas.com>
> 
> Taking your word for the motivation for this change,
> this patch seems fine to me but I would like to wait for review
> from others.
> 
> Reviewed-by: Simon Horman <horms+renesas@verge.net.au>

I am marking this as deferred until R8A774C0_CLK_CANFD
shows up in an rc release.

Alternatively I'd be happy to take a version that uses
numeric values, followed up by a patch to switching to R8A774C0_CLK_CANFD
once it is available in an rc release.

Please repost or otherwise ping me as appropriate.

> 
> > ---
> >  arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 12 ++++++++----
> >  1 file changed, 8 insertions(+), 4 deletions(-)
> > 
> > diff --git a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> > index 3970aaf..326ab3a 100644
> > --- a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> > @@ -809,8 +809,10 @@
> >  				     "renesas,rcar-gen3-can";
> >  			reg = <0 0xe6c30000 0 0x1000>;
> >  			interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
> > -			clocks = <&cpg CPG_MOD 916>, <&can_clk>;
> > -			clock-names = "clkp1", "can_clk";
> > +			clocks = <&cpg CPG_MOD 916>,
> > +				 <&cpg CPG_CORE R8A774C0_CLK_CANFD>,
> > +				 <&can_clk>;
> > +			clock-names = "clkp1", "clkp2", "can_clk";
> >  			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
> >  			resets = <&cpg 916>;
> >  			status = "disabled";
> > @@ -821,8 +823,10 @@
> >  				     "renesas,rcar-gen3-can";
> >  			reg = <0 0xe6c38000 0 0x1000>;
> >  			interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
> > -			clocks = <&cpg CPG_MOD 915>, <&can_clk>;
> > -			clock-names = "clkp1", "can_clk";
> > +			clocks = <&cpg CPG_MOD 915>,
> > +				 <&cpg CPG_CORE R8A774C0_CLK_CANFD>,
> > +				 <&can_clk>;
> > +			clock-names = "clkp1", "clkp2", "can_clk";
> >  			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
> >  			resets = <&cpg 915>;
> >  			status = "disabled";
> > -- 
> > 2.7.4
> > 
>
Fabrizio Castro March 19, 2019, 11:12 a.m. UTC | #3 
Hello Simon,

> From: Simon Horman <horms@verge.net.au>
> Sent: 28 January 2019 13:03
> Subject: Re: [PATCH 10/11] arm64: dts: renesas: r8a774c0: Add clkp2 clock to CAN nodes
> 
> On Thu, Jan 17, 2019 at 01:05:42PM +0100, Simon Horman wrote:
> > On Wed, Jan 16, 2019 at 06:37:53PM +0000, Fabrizio Castro wrote:
> > > According to the latest information, clkp2 is available on RZ/G2.
> > > Modify CAN0 and CAN1 nodes accordingly.
> > >
> > > Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> > > Reviewed-by: Chris Paterson <Chris.Paterson2@renesas.com>
> >
> > Taking your word for the motivation for this change,
> > this patch seems fine to me but I would like to wait for review
> > from others.
> >
> > Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> 
> I am marking this as deferred until R8A774C0_CLK_CANFD
> shows up in an rc release.
> 
> Alternatively I'd be happy to take a version that uses
> numeric values, followed up by a patch to switching to R8A774C0_CLK_CANFD
> once it is available in an rc release.
> 
> Please repost or otherwise ping me as appropriate.

It seems like this patch still applies without conflicts, do you mind taking it now
as R8A774C0_CLK_CANFD is finally available?

Thanks,
Fab

> 
> >
> > > ---
> > >  arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 12 ++++++++----
> > >  1 file changed, 8 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> > > index 3970aaf..326ab3a 100644
> > > --- a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> > > +++ b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> > > @@ -809,8 +809,10 @@
> > >  				     "renesas,rcar-gen3-can";
> > >  			reg = <0 0xe6c30000 0 0x1000>;
> > >  			interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
> > > -			clocks = <&cpg CPG_MOD 916>, <&can_clk>;
> > > -			clock-names = "clkp1", "can_clk";
> > > +			clocks = <&cpg CPG_MOD 916>,
> > > +				 <&cpg CPG_CORE R8A774C0_CLK_CANFD>,
> > > +				 <&can_clk>;
> > > +			clock-names = "clkp1", "clkp2", "can_clk";
> > >  			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
> > >  			resets = <&cpg 916>;
> > >  			status = "disabled";
> > > @@ -821,8 +823,10 @@
> > >  				     "renesas,rcar-gen3-can";
> > >  			reg = <0 0xe6c38000 0 0x1000>;
> > >  			interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
> > > -			clocks = <&cpg CPG_MOD 915>, <&can_clk>;
> > > -			clock-names = "clkp1", "can_clk";
> > > +			clocks = <&cpg CPG_MOD 915>,
> > > +				 <&cpg CPG_CORE R8A774C0_CLK_CANFD>,
> > > +				 <&can_clk>;
> > > +			clock-names = "clkp1", "clkp2", "can_clk";
> > >  			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
> > >  			resets = <&cpg 915>;
> > >  			status = "disabled";
> > > --
> > > 2.7.4
> > >
> >
Simon Horman March 19, 2019, 11:54 a.m. UTC | #4 
On Tue, Mar 19, 2019 at 11:12:33AM +0000, Fabrizio Castro wrote:
> Hello Simon,
> 
> > From: Simon Horman <horms@verge.net.au>
> > Sent: 28 January 2019 13:03
> > Subject: Re: [PATCH 10/11] arm64: dts: renesas: r8a774c0: Add clkp2 clock to CAN nodes
> > 
> > On Thu, Jan 17, 2019 at 01:05:42PM +0100, Simon Horman wrote:
> > > On Wed, Jan 16, 2019 at 06:37:53PM +0000, Fabrizio Castro wrote:
> > > > According to the latest information, clkp2 is available on RZ/G2.
> > > > Modify CAN0 and CAN1 nodes accordingly.
> > > >
> > > > Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> > > > Reviewed-by: Chris Paterson <Chris.Paterson2@renesas.com>
> > >
> > > Taking your word for the motivation for this change,
> > > this patch seems fine to me but I would like to wait for review
> > > from others.
> > >
> > > Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> > 
> > I am marking this as deferred until R8A774C0_CLK_CANFD
> > shows up in an rc release.
> > 
> > Alternatively I'd be happy to take a version that uses
> > numeric values, followed up by a patch to switching to R8A774C0_CLK_CANFD
> > once it is available in an rc release.
> > 
> > Please repost or otherwise ping me as appropriate.
> 
> It seems like this patch still applies without conflicts, do you mind taking it now
> as R8A774C0_CLK_CANFD is finally available?

Thanks, I agree this should be ready now.
I've applied it for v5.2.

> 
> Thanks,
> Fab
> 
> > 
> > >
> > > > ---
> > > >  arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 12 ++++++++----
> > > >  1 file changed, 8 insertions(+), 4 deletions(-)
> > > >
> > > > diff --git a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> > > > index 3970aaf..326ab3a 100644
> > > > --- a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> > > > +++ b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
> > > > @@ -809,8 +809,10 @@
> > > >  				     "renesas,rcar-gen3-can";
> > > >  			reg = <0 0xe6c30000 0 0x1000>;
> > > >  			interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
> > > > -			clocks = <&cpg CPG_MOD 916>, <&can_clk>;
> > > > -			clock-names = "clkp1", "can_clk";
> > > > +			clocks = <&cpg CPG_MOD 916>,
> > > > +				 <&cpg CPG_CORE R8A774C0_CLK_CANFD>,
> > > > +				 <&can_clk>;
> > > > +			clock-names = "clkp1", "clkp2", "can_clk";
> > > >  			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
> > > >  			resets = <&cpg 916>;
> > > >  			status = "disabled";
> > > > @@ -821,8 +823,10 @@
> > > >  				     "renesas,rcar-gen3-can";
> > > >  			reg = <0 0xe6c38000 0 0x1000>;
> > > >  			interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
> > > > -			clocks = <&cpg CPG_MOD 915>, <&can_clk>;
> > > > -			clock-names = "clkp1", "can_clk";
> > > > +			clocks = <&cpg CPG_MOD 915>,
> > > > +				 <&cpg CPG_CORE R8A774C0_CLK_CANFD>,
> > > > +				 <&can_clk>;
> > > > +			clock-names = "clkp1", "clkp2", "can_clk";
> > > >  			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
> > > >  			resets = <&cpg 915>;
> > > >  			status = "disabled";
> > > > --
> > > > 2.7.4
> > > >
> > >
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
index 3970aaf..326ab3a 100644
--- a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
@@ -809,8 +809,10 @@ 
 				     "renesas,rcar-gen3-can";
 			reg = <0 0xe6c30000 0 0x1000>;
 			interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD 916>, <&can_clk>;
-			clock-names = "clkp1", "can_clk";
+			clocks = <&cpg CPG_MOD 916>,
+				 <&cpg CPG_CORE R8A774C0_CLK_CANFD>,
+				 <&can_clk>;
+			clock-names = "clkp1", "clkp2", "can_clk";
 			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
 			resets = <&cpg 916>;
 			status = "disabled";
@@ -821,8 +823,10 @@ 
 				     "renesas,rcar-gen3-can";
 			reg = <0 0xe6c38000 0 0x1000>;
 			interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&cpg CPG_MOD 915>, <&can_clk>;
-			clock-names = "clkp1", "can_clk";
+			clocks = <&cpg CPG_MOD 915>,
+				 <&cpg CPG_CORE R8A774C0_CLK_CANFD>,
+				 <&can_clk>;
+			clock-names = "clkp1", "clkp2", "can_clk";
 			power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
 			resets = <&cpg 915>;
 			status = "disabled";