diff mbox

[2/2] ARM: dts: r8a7743: Add IIC cores to dtsi

Message ID 1502196418-31341-1-git-send-email-biju.das@bp.renesas.com (mailing list archive)
State Changes Requested
Headers show

Commit Message

Biju Das Aug. 8, 2017, 12:46 p.m. UTC
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
This patch has been tested against Linux-next tag 20170727 and renesas-dev branch.
This patch depends on https://www.spinics.net/lists/arm-kernel/msg599220.html

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

Comments

Simon Horman Aug. 9, 2017, 8:56 a.m. UTC | #1
On Tue, Aug 08, 2017 at 01:46:58PM +0100, Biju Das wrote:
> Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> ---
> This patch has been tested against Linux-next tag 20170727 and renesas-dev branch.
> This patch depends on https://www.spinics.net/lists/arm-kernel/msg599220.html

Process comments as per those for
"[PATCH  2/2] ARM: dts: r8a7743: Add I2C DT support".

Patch itself looks good to me.

> 
>  arch/arm/boot/dts/r8a7743.dtsi | 55 ++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 55 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
> index 14222c72..5c2b140 100644
> --- a/arch/arm/boot/dts/r8a7743.dtsi
> +++ b/arch/arm/boot/dts/r8a7743.dtsi
> @@ -25,6 +25,9 @@
>  		i2c3 = &i2c3;
>  		i2c4 = &i2c4;
>  		i2c5 = &i2c5;
> +		i2c6 = &i2c6;
> +		i2c7 = &i2c7;
> +		i2c8 = &i2c8;
>  	};
>  
>  	cpus {
> @@ -436,6 +439,58 @@
>  			status = "disabled";
>  		};
>  
> +		i2c6: i2c@e60b0000 {
> +			/* doesn't need pinmux */
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			compatible = "renesas,iic-r8a7743",
> +				     "renesas,rcar-gen2-iic",
> +				     "renesas,rmobile-iic";
> +			reg = <0 0xe60b0000 0 0x425>;
> +			interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&cpg CPG_MOD 926>;
> +			dmas = <&dmac0 0x77>, <&dmac0 0x78>,
> +			       <&dmac1 0x77>, <&dmac1 0x78>;
> +			dma-names = "tx", "rx", "tx", "rx";
> +			power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
> +			resets = <&cpg CPG_MOD 926>;
> +			status = "disabled";
> +		};
> +
> +		i2c7: i2c@e6500000 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			compatible = "renesas,iic-r8a7743",
> +				     "renesas,rcar-gen2-iic",
> +				     "renesas,rmobile-iic";
> +			reg = <0 0xe6500000 0 0x425>;
> +			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&cpg CPG_MOD 318>;
> +			dmas = <&dmac0 0x61>, <&dmac0 0x62>,
> +			       <&dmac1 0x61>, <&dmac1 0x62>;
> +			dma-names = "tx", "rx", "tx", "rx";
> +			power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
> +			resets = <&cpg 318>;
> +			status = "disabled";
> +		};
> +
> +		i2c8: i2c@e6510000 {
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			compatible = "renesas,iic-r8a7743",
> +				     "renesas,rcar-gen2-iic",
> +				     "renesas,rmobile-iic";
> +			reg = <0 0xe6510000 0 0x425>;
> +			interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&cpg CPG_MOD 323>;
> +			dmas = <&dmac0 0x65>, <&dmac0 0x66>,
> +			       <&dmac1 0x65>, <&dmac1 0x66>;
> +			dma-names = "tx", "rx", "tx", "rx";
> +			power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
> +			resets = <&cpg 323>;
> +			status = "disabled";
> +		};
> +
>  		scifa0: serial@e6c40000 {
>  			compatible = "renesas,scifa-r8a7743",
>  				     "renesas,rcar-gen2-scifa", "renesas,scifa";
> -- 
> 1.9.1
>
Sergei Shtylyov Aug. 9, 2017, 9:17 a.m. UTC | #2
On 8/8/2017 3:46 PM, Biju Das wrote:

> Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> ---
> This patch has been tested against Linux-next tag 20170727 and renesas-dev branch.
> This patch depends on https://www.spinics.net/lists/arm-kernel/msg599220.html
> 
>   arch/arm/boot/dts/r8a7743.dtsi | 55 ++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 55 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
> index 14222c72..5c2b140 100644
> --- a/arch/arm/boot/dts/r8a7743.dtsi
> +++ b/arch/arm/boot/dts/r8a7743.dtsi
[...]
> @@ -436,6 +439,58 @@
>   			status = "disabled";
>   		};
>   
> +		i2c6: i2c@e60b0000 {

    I'd use iic0 as the label.

> +			/* doesn't need pinmux */
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			compatible = "renesas,iic-r8a7743",
> +				     "renesas,rcar-gen2-iic",
> +				     "renesas,rmobile-iic";
> +			reg = <0 0xe60b0000 0 0x425>;
> +			interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&cpg CPG_MOD 926>;
> +			dmas = <&dmac0 0x77>, <&dmac0 0x78>,
> +			       <&dmac1 0x77>, <&dmac1 0x78>;
> +			dma-names = "tx", "rx", "tx", "rx";
> +			power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
> +			resets = <&cpg CPG_MOD 926>;

    CPG_MOD not needed here, it's not a "clocks" prop.

[...]

MBR, Sergei
Biju Das Aug. 9, 2017, 9:21 a.m. UTC | #3
> -----Original Message-----

> From: Sergei Shtylyov [mailto:sergei.shtylyov@cogentembedded.com]

> Sent: 09 August 2017 10:17

> To: Biju Das <biju.das@bp.renesas.com>; Rob Herring <robh+dt@kernel.org>;

> Mark Rutland <mark.rutland@arm.com>

> Cc: Simon Horman <horms@verge.net.au>; Wolfram Sang <wsa@the-

> dreams.de>; Magnus Damm <magnus.damm@gmail.com>; Russell King

> <linux@armlinux.org.uk>; Chris Paterson <Chris.Paterson2@renesas.com>;

> devicetree@vger.kernel.org; linux-renesas-soc@vger.kernel.org; linux-arm-

> kernel@lists.infradead.org

> Subject: Re: [PATCH 2/2] ARM: dts: r8a7743: Add IIC cores to dtsi

>

> On 8/8/2017 3:46 PM, Biju Das wrote:

>

> > Signed-off-by: Biju Das <biju.das@bp.renesas.com>

> > ---

> > This patch has been tested against Linux-next tag 20170727 and renesas-dev

> branch.

> > This patch depends on

> > https://www.spinics.net/lists/arm-kernel/msg599220.html

> >

> >   arch/arm/boot/dts/r8a7743.dtsi | 55

> ++++++++++++++++++++++++++++++++++++++++++

> >   1 file changed, 55 insertions(+)

> >

> > diff --git a/arch/arm/boot/dts/r8a7743.dtsi

> > b/arch/arm/boot/dts/r8a7743.dtsi index 14222c72..5c2b140 100644

> > --- a/arch/arm/boot/dts/r8a7743.dtsi

> > +++ b/arch/arm/boot/dts/r8a7743.dtsi

> [...]

> > @@ -436,6 +439,58 @@

> >   status = "disabled";

> >   };

> >

> > +i2c6: i2c@e60b0000 {

>

>     I'd use iic0 as the label.

>

> > +/* doesn't need pinmux */

> > +#address-cells = <1>;

> > +#size-cells = <0>;

> > +compatible = "renesas,iic-r8a7743",

> > +     "renesas,rcar-gen2-iic",

> > +     "renesas,rmobile-iic";

> > +reg = <0 0xe60b0000 0 0x425>;

> > +interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;

> > +clocks = <&cpg CPG_MOD 926>;

> > +dmas = <&dmac0 0x77>, <&dmac0 0x78>,

> > +       <&dmac1 0x77>, <&dmac1 0x78>;

> > +dma-names = "tx", "rx", "tx", "rx";

> > +power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;

> > +resets = <&cpg CPG_MOD 926>;

>

>     CPG_MOD not needed here, it's not a "clocks" prop.

Thanks Sergie,  I will correct this.
[>]
> [...]

>

> MBR, Sergei




Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.
Simon Horman Aug. 10, 2017, 8:01 a.m. UTC | #4
On Wed, Aug 09, 2017 at 12:17:06PM +0300, Sergei Shtylyov wrote:
> On 8/8/2017 3:46 PM, Biju Das wrote:
> 
> >Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> >---
> >This patch has been tested against Linux-next tag 20170727 and renesas-dev branch.
> >This patch depends on https://www.spinics.net/lists/arm-kernel/msg599220.html
> >
> >  arch/arm/boot/dts/r8a7743.dtsi | 55 ++++++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 55 insertions(+)
> >
> >diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
> >index 14222c72..5c2b140 100644
> >--- a/arch/arm/boot/dts/r8a7743.dtsi
> >+++ b/arch/arm/boot/dts/r8a7743.dtsi
> [...]
> >@@ -436,6 +439,58 @@
> >  			status = "disabled";
> >  		};
> >+		i2c6: i2c@e60b0000 {
> 
>    I'd use iic0 as the label.

I have no preference here other than that we try to be consistent
in DT for different R-Car SoCs. Wolfram, do you have an opinion on this?

> 
> >+			/* doesn't need pinmux */
> >+			#address-cells = <1>;
> >+			#size-cells = <0>;
> >+			compatible = "renesas,iic-r8a7743",
> >+				     "renesas,rcar-gen2-iic",
> >+				     "renesas,rmobile-iic";
> >+			reg = <0 0xe60b0000 0 0x425>;
> >+			interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
> >+			clocks = <&cpg CPG_MOD 926>;
> >+			dmas = <&dmac0 0x77>, <&dmac0 0x78>,
> >+			       <&dmac1 0x77>, <&dmac1 0x78>;
> >+			dma-names = "tx", "rx", "tx", "rx";
> >+			power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
> >+			resets = <&cpg CPG_MOD 926>;
> 
>    CPG_MOD not needed here, it's not a "clocks" prop.
> 
> [...]
> 
> MBR, Sergei
>
Wolfram Sang Aug. 10, 2017, 11:24 a.m. UTC | #5
> > >+		i2c6: i2c@e60b0000 {
> > 
> >    I'd use iic0 as the label.
> 
> I have no preference here other than that we try to be consistent
> in DT for different R-Car SoCs. Wolfram, do you have an opinion on this?

Back then, for M2-W, I decided to go with the schematics/datasheets.
And those mentioned i2c6 rather than iic0. For that reason, the comment

"/* The memory map in the User's Manual maps the cores to bus numbers */"

exists in r8a7791.dtsi. Dunno the manual of this SoC here.
Chris Paterson Aug. 10, 2017, 1:49 p.m. UTC | #6
Hello,

> From: Wolfram Sang [mailto:wsa@the-dreams.de]
> Sent: 10 August 2017 12:24
> 
> 
> > > >+		i2c6: i2c@e60b0000 {
> > >
> > >    I'd use iic0 as the label.
> >
> > I have no preference here other than that we try to be consistent in
> > DT for different R-Car SoCs. Wolfram, do you have an opinion on this?
> 
> Back then, for M2-W, I decided to go with the schematics/datasheets.
> And those mentioned i2c6 rather than iic0. For that reason, the comment

The M2 schematics still use i2c6, and for consistency I'd vote to use the same with RZ/G1M.

> 
> "/* The memory map in the User's Manual maps the cores to bus numbers */"
> 
> exists in r8a7791.dtsi. Dunno the manual of this SoC here.

The manual for r8a7743 uses the same terminology as the r8a7791 manuals.

Kind regards, Chris
Simon Horman Aug. 11, 2017, 8:48 a.m. UTC | #7
On Thu, Aug 10, 2017 at 01:49:05PM +0000, Chris Paterson wrote:
> Hello,
> 
> > From: Wolfram Sang [mailto:wsa@the-dreams.de]
> > Sent: 10 August 2017 12:24
> > 
> > 
> > > > >+		i2c6: i2c@e60b0000 {
> > > >
> > > >    I'd use iic0 as the label.
> > >
> > > I have no preference here other than that we try to be consistent in
> > > DT for different R-Car SoCs. Wolfram, do you have an opinion on this?
> > 
> > Back then, for M2-W, I decided to go with the schematics/datasheets.
> > And those mentioned i2c6 rather than iic0. For that reason, the comment
> 
> The M2 schematics still use i2c6, and for consistency I'd vote to use the same with RZ/G1M.

+1

> > "/* The memory map in the User's Manual maps the cores to bus numbers */"
> > 
> > exists in r8a7791.dtsi. Dunno the manual of this SoC here.
> 
> The manual for r8a7743 uses the same terminology as the r8a7791 manuals.
Geert Uytterhoeven Aug. 14, 2017, 2:15 p.m. UTC | #8
On Thu, Aug 10, 2017 at 3:49 PM, Chris Paterson
<Chris.Paterson2@renesas.com> wrote:
>> From: Wolfram Sang [mailto:wsa@the-dreams.de]
>> Sent: 10 August 2017 12:24
>>
>>
>> > > >+                i2c6: i2c@e60b0000 {
>> > >
>> > >    I'd use iic0 as the label.

Sergei: I assume you meant "iic3"? ;-)

>> >
>> > I have no preference here other than that we try to be consistent in
>> > DT for different R-Car SoCs. Wolfram, do you have an opinion on this?
>>
>> Back then, for M2-W, I decided to go with the schematics/datasheets.
>> And those mentioned i2c6 rather than iic0. For that reason, the comment
>
> The M2 schematics still use i2c6, and for consistency I'd vote to use the same with RZ/G1M.
>
>>
>> "/* The memory map in the User's Manual maps the cores to bus numbers */"
>>
>> exists in r8a7791.dtsi. Dunno the manual of this SoC here.
>
> The manual for r8a7743 uses the same terminology as the r8a7791 manuals.

The pinctrl section does, indeed.

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
Sergei Shtylyov Aug. 22, 2017, 12:20 p.m. UTC | #9
Hello!

On 08/14/2017 05:15 PM, Geert Uytterhoeven wrote:

>>> From: Wolfram Sang [mailto:wsa@the-dreams.de]
>>> Sent: 10 August 2017 12:24
>>>
>>>
>>>>>> +                i2c6: i2c@e60b0000 {
>>>>>
>>>>>     I'd use iic0 as the label.
> 
> Sergei: I assume you meant "iic3"? ;-)

    After having a look at the manual, yes. :-)

[...]

> Gr{oetje,eeting}s,
> 
>                          Geert

MBR, Sergei
diff mbox

Patch

diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
index 14222c72..5c2b140 100644
--- a/arch/arm/boot/dts/r8a7743.dtsi
+++ b/arch/arm/boot/dts/r8a7743.dtsi
@@ -25,6 +25,9 @@ 
 		i2c3 = &i2c3;
 		i2c4 = &i2c4;
 		i2c5 = &i2c5;
+		i2c6 = &i2c6;
+		i2c7 = &i2c7;
+		i2c8 = &i2c8;
 	};
 
 	cpus {
@@ -436,6 +439,58 @@ 
 			status = "disabled";
 		};
 
+		i2c6: i2c@e60b0000 {
+			/* doesn't need pinmux */
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "renesas,iic-r8a7743",
+				     "renesas,rcar-gen2-iic",
+				     "renesas,rmobile-iic";
+			reg = <0 0xe60b0000 0 0x425>;
+			interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 926>;
+			dmas = <&dmac0 0x77>, <&dmac0 0x78>,
+			       <&dmac1 0x77>, <&dmac1 0x78>;
+			dma-names = "tx", "rx", "tx", "rx";
+			power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+			resets = <&cpg CPG_MOD 926>;
+			status = "disabled";
+		};
+
+		i2c7: i2c@e6500000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "renesas,iic-r8a7743",
+				     "renesas,rcar-gen2-iic",
+				     "renesas,rmobile-iic";
+			reg = <0 0xe6500000 0 0x425>;
+			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 318>;
+			dmas = <&dmac0 0x61>, <&dmac0 0x62>,
+			       <&dmac1 0x61>, <&dmac1 0x62>;
+			dma-names = "tx", "rx", "tx", "rx";
+			power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+			resets = <&cpg 318>;
+			status = "disabled";
+		};
+
+		i2c8: i2c@e6510000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "renesas,iic-r8a7743",
+				     "renesas,rcar-gen2-iic",
+				     "renesas,rmobile-iic";
+			reg = <0 0xe6510000 0 0x425>;
+			interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 323>;
+			dmas = <&dmac0 0x65>, <&dmac0 0x66>,
+			       <&dmac1 0x65>, <&dmac1 0x66>;
+			dma-names = "tx", "rx", "tx", "rx";
+			power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
+			resets = <&cpg 323>;
+			status = "disabled";
+		};
+
 		scifa0: serial@e6c40000 {
 			compatible = "renesas,scifa-r8a7743",
 				     "renesas,rcar-gen2-scifa", "renesas,scifa";