| Message ID | 1543319795-48325-3-git-send-email-biju.das@bp.renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Simon Horman |
| Headers | show |
| Series | Add more support to RZ/G1N | expand |
On Tue, Nov 27, 2018 at 11:56:15AM +0000, Biju Das wrote: > Add the I2C[0-5] and IIC[0,1,3] devices nodes to the R8A7744 device tree. > > Signed-off-by: Biju Das <biju.das@bp.renesas.com> > --- > arch/arm/boot/dts/r8a7744.dtsi | 141 ++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 139 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/r8a7744.dtsi b/arch/arm/boot/dts/r8a7744.dtsi > index 165c701..6505ebd 100644 > --- a/arch/arm/boot/dts/r8a7744.dtsi > +++ b/arch/arm/boot/dts/r8a7744.dtsi > @@ -15,6 +15,18 @@ > #address-cells = <2>; > #size-cells = <2>; > > + aliases { > + i2c0 = &i2c0; > + i2c1 = &i2c1; > + i2c2 = &i2c2; > + i2c3 = &i2c3; > + i2c4 = &i2c4; > + i2c5 = &i2c5; > + i2c6 = &iic0; > + i2c7 = &iic1; > + i2c8 = &iic3; > + }; > + I believe we are moving away from adding aliases such as those above. Geert, can you comment on this? Other than that this patch looks good to me. Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Hi Simon & Geert, Thanks for the feedback. > -----Original Message----- > From: linux-renesas-soc-owner@vger.kernel.org <linux-renesas-soc- > owner@vger.kernel.org> On Behalf Of Simon Horman > Sent: 29 November 2018 13:41 > To: Biju Das <biju.das@bp.renesas.com> > Cc: Rob Herring <robh+dt@kernel.org>; Mark Rutland > <mark.rutland@arm.com>; Magnus Damm <magnus.damm@gmail.com>; > linux-renesas-soc@vger.kernel.org; devicetree@vger.kernel.org; Geert > Uytterhoeven <geert+renesas@glider.be>; Chris Paterson > <Chris.Paterson2@renesas.com>; Fabrizio Castro > <fabrizio.castro@bp.renesas.com> > Subject: Re: [PATCH 02/22] ARM: dts: r8a7744: Add I2C and IIC support > > On Tue, Nov 27, 2018 at 11:56:15AM +0000, Biju Das wrote: > > Add the I2C[0-5] and IIC[0,1,3] devices nodes to the R8A7744 device tree. > > > > Signed-off-by: Biju Das <biju.das@bp.renesas.com> > > --- > > arch/arm/boot/dts/r8a7744.dtsi | 141 > > ++++++++++++++++++++++++++++++++++++++++- > > 1 file changed, 139 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm/boot/dts/r8a7744.dtsi > > b/arch/arm/boot/dts/r8a7744.dtsi index 165c701..6505ebd 100644 > > --- a/arch/arm/boot/dts/r8a7744.dtsi > > +++ b/arch/arm/boot/dts/r8a7744.dtsi > > @@ -15,6 +15,18 @@ > > #address-cells = <2>; > > #size-cells = <2>; > > > > +aliases { > > +i2c0 = &i2c0; > > +i2c1 = &i2c1; > > +i2c2 = &i2c2; > > +i2c3 = &i2c3; > > +i2c4 = &i2c4; > > +i2c5 = &i2c5; > > +i2c6 = &iic0; > > +i2c7 = &iic1; > > +i2c8 = &iic3; > > +}; > > + > > I believe we are moving away from adding aliases such as those above. > Geert, can you comment on this? I thought of removing this for the first instance. But for tools like i2cdetect, it works on index. Basically we need to work out index from device name, if we don't have aliases. Regards, Biju > Other than that this patch looks good to me. > Reviewed-by: Simon Horman <horms+renesas@verge.net.au> Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.
Hi Biju, On Tue, Nov 27, 2018 at 1:05 PM Biju Das <biju.das@bp.renesas.com> wrote: > Add the I2C[0-5] and IIC[0,1,3] devices nodes to the R8A7744 device tree. > > Signed-off-by: Biju Das <biju.das@bp.renesas.com> Thanks for your patch! > --- a/arch/arm/boot/dts/r8a7744.dtsi > +++ b/arch/arm/boot/dts/r8a7744.dtsi > @@ -15,6 +15,18 @@ > #address-cells = <2>; > #size-cells = <2>; > > + aliases { > + i2c0 = &i2c0; > + i2c1 = &i2c1; > + i2c2 = &i2c2; > + i2c3 = &i2c3; > + i2c4 = &i2c4; > + i2c5 = &i2c5; > + i2c6 = &iic0; > + i2c7 = &iic1; > + i2c8 = &iic3; > + }; Please drop the i2c aliases. If needed at all, device aliases are board-specific (for ports labeled e.g. "i2c0"). > + iic3: i2c@e60b0000 { > + /* doesn't need pinmux */ > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "renesas,iic-r8a7744", > + "renesas,rcar-gen2-iic", > + "renesas,rmobile-iic"; It seems iic3 on RZ/G1N is different, in that it does not support automatic transmission. This is a bit similar like on R-Car E3, where we dropped compatibility with the generic version to indicate this. But on RZ/G1N we cannot use the same solution, as the limitation does not apply to all instances. RZ/G1H and RZ/G1M have the same issue. > + 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 R8A7744_PD_ALWAYS_ON>; > + resets = <&cpg 926>; > + status = "disabled"; > }; 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
diff --git a/arch/arm/boot/dts/r8a7744.dtsi b/arch/arm/boot/dts/r8a7744.dtsi index 165c701..6505ebd 100644 --- a/arch/arm/boot/dts/r8a7744.dtsi +++ b/arch/arm/boot/dts/r8a7744.dtsi @@ -15,6 +15,18 @@ #address-cells = <2>; #size-cells = <2>; + aliases { + i2c0 = &i2c0; + i2c1 = &i2c1; + i2c2 = &i2c2; + i2c3 = &i2c3; + i2c4 = &i2c4; + i2c5 = &i2c5; + i2c6 = &iic0; + i2c7 = &iic1; + i2c8 = &iic3; + }; + /* * The external audio clocks are configured as 0 Hz fixed frequency * clocks by default. @@ -310,19 +322,144 @@ reg = <0 0xe6300000 0 0x40000>; }; + /* The memory map in the User's Manual maps the cores to + * bus numbers + */ + i2c0: i2c@e6508000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,i2c-r8a7744", + "renesas,rcar-gen2-i2c"; + reg = <0 0xe6508000 0 0x40>; + interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cpg CPG_MOD 931>; + power-domains = <&sysc R8A7744_PD_ALWAYS_ON>; + resets = <&cpg 931>; + i2c-scl-internal-delay-ns = <6>; + status = "disabled"; + }; + + i2c1: i2c@e6518000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,i2c-r8a7744", + "renesas,rcar-gen2-i2c"; + reg = <0 0xe6518000 0 0x40>; + interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cpg CPG_MOD 930>; + power-domains = <&sysc R8A7744_PD_ALWAYS_ON>; + resets = <&cpg 930>; + i2c-scl-internal-delay-ns = <6>; + status = "disabled"; + }; + i2c2: i2c@e6530000 { #address-cells = <1>; #size-cells = <0>; + compatible = "renesas,i2c-r8a7744", + "renesas,rcar-gen2-i2c"; reg = <0 0xe6530000 0 0x40>; - /* placeholder */ + interrupts = <GIC_SPI 286 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cpg CPG_MOD 929>; + power-domains = <&sysc R8A7744_PD_ALWAYS_ON>; + resets = <&cpg 929>; + i2c-scl-internal-delay-ns = <6>; + status = "disabled"; + }; + + i2c3: i2c@e6540000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,i2c-r8a7744", + "renesas,rcar-gen2-i2c"; + reg = <0 0xe6540000 0 0x40>; + interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cpg CPG_MOD 928>; + power-domains = <&sysc R8A7744_PD_ALWAYS_ON>; + resets = <&cpg 928>; + i2c-scl-internal-delay-ns = <6>; + status = "disabled"; + }; + + i2c4: i2c@e6520000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,i2c-r8a7744", + "renesas,rcar-gen2-i2c"; + reg = <0 0xe6520000 0 0x40>; + interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cpg CPG_MOD 927>; + power-domains = <&sysc R8A7744_PD_ALWAYS_ON>; + resets = <&cpg 927>; + i2c-scl-internal-delay-ns = <6>; + status = "disabled"; }; i2c5: i2c@e6528000 { /* doesn't need pinmux */ #address-cells = <1>; #size-cells = <0>; + compatible = "renesas,i2c-r8a7744", + "renesas,rcar-gen2-i2c"; reg = <0 0xe6528000 0 0x40>; - /* placeholder */ + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cpg CPG_MOD 925>; + power-domains = <&sysc R8A7744_PD_ALWAYS_ON>; + resets = <&cpg 925>; + i2c-scl-internal-delay-ns = <110>; + status = "disabled"; + }; + + iic0: i2c@e6500000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,iic-r8a7744", + "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 R8A7744_PD_ALWAYS_ON>; + resets = <&cpg 318>; + status = "disabled"; + }; + + iic1: i2c@e6510000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,iic-r8a7744", + "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 R8A7744_PD_ALWAYS_ON>; + resets = <&cpg 323>; + status = "disabled"; + }; + + iic3: i2c@e60b0000 { + /* doesn't need pinmux */ + #address-cells = <1>; + #size-cells = <0>; + compatible = "renesas,iic-r8a7744", + "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 R8A7744_PD_ALWAYS_ON>; + resets = <&cpg 926>; + status = "disabled"; }; hsusb: usb@e6590000 {
Add the I2C[0-5] and IIC[0,1,3] devices nodes to the R8A7744 device tree. Signed-off-by: Biju Das <biju.das@bp.renesas.com> --- arch/arm/boot/dts/r8a7744.dtsi | 141 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 139 insertions(+), 2 deletions(-)