[PATCH 0/4] R-Car M3-W Salvator-X: Add ethernet support

[PATCH 0/4] R-Car M3-W Salvator-X: Add ethernet support

[Laurent Pinchart]

Hello,

This patch series adds support for the RAVB ethernet controller on the M3-W
(R8A7796) Salvator-X board.

The patches are based on top of Simon's latest devel branch, with the
following patches cherry-picked:

[PATCH/RFT 1/8] clk: renesas: r8a7796: Add GPIO clocks
[PATCH/RFT 4/8] gpio: rcar: Add r8a7796 (R-Car M3-W) support
[PATCH/RFT 6/8] arm64: dts: r8a7796: Add GPIO device nodes

I'd like to suggest merging the GPIO support without PFC if it helps getting
ethernet support in v4.9, as this is a very handy feature for development.

Laurent Pinchart (4):
  clk: shmobile: r8a7796: Add RAVB clock
  dt-bindings: net: renesas-ravb: Add support for R8A7796 RAVB
  arm64: dts: renesas: r8a7796: Add EthernetAVB instance
  arm64: dts: r8a7796: Enable EthernetAVB on Salvator-X

 .../devicetree/bindings/net/renesas,ravb.txt       |  3 +-
 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 25 +++++++++++++
 arch/arm64/boot/dts/renesas/r8a7796.dtsi           | 43 ++++++++++++++++++++++
 drivers/clk/renesas/r8a7796-cpg-mssr.c             |  1 +
 4 files changed, 71 insertions(+), 1 deletion(-)

-- 
Regards,

Laurent Pinchart

[PATCH 1/4] clk: shmobile: r8a7796: Add RAVB clock

[Laurent Pinchart]

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/clk/renesas/r8a7796-cpg-mssr.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
index cfd5ffb77dfe..868dfe30dfe7 100644
--- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
@@ -99,6 +99,7 @@ static const struct cpg_core_clk r8a7796_core_clks[] __initconst = {
 static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = {
 	DEF_MOD("scif2",		 310,	R8A7796_CLK_S3D4),
 	DEF_MOD("intc-ap",		 408,	R8A7796_CLK_S3D1),
+	DEF_MOD("etheravb",		 812,	R8A7796_CLK_S3D2),
 	DEF_MOD("gpio7",		 905,	R8A7796_CLK_S3D4),
 	DEF_MOD("gpio6",		 906,	R8A7796_CLK_S3D4),
 	DEF_MOD("gpio5",		 907,	R8A7796_CLK_S3D4),
-- 
Regards,

Laurent Pinchart

[PATCH 2/4] dt-bindings: net: renesas-ravb: Add support for R8A7796 RAVB

[Laurent Pinchart]

Add a new compatible string for the R8A7796 (M3-W) RAVB.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 Documentation/devicetree/bindings/net/renesas,ravb.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/net/renesas,ravb.txt b/Documentation/devicetree/bindings/net/renesas,ravb.txt
index c8ac222eac67..b519503be51a 100644
--- a/Documentation/devicetree/bindings/net/renesas,ravb.txt
+++ b/Documentation/devicetree/bindings/net/renesas,ravb.txt
@@ -10,6 +10,7 @@ Required properties:
 	      "renesas,etheravb-r8a7793" if the device is a part of R8A7793 SoC.
 	      "renesas,etheravb-r8a7794" if the device is a part of R8A7794 SoC.
 	      "renesas,etheravb-r8a7795" if the device is a part of R8A7795 SoC.
+	      "renesas,etheravb-r8a7796" if the device is a part of R8A7796 SoC.
 	      "renesas,etheravb-rcar-gen2" for generic R-Car Gen 2 compatible interface.
 	      "renesas,etheravb-rcar-gen3" for generic R-Car Gen 3 compatible interface.
 
@@ -33,7 +34,7 @@ Optional properties:
 - interrupt-parent: the phandle for the interrupt controller that services
 		    interrupts for this device.
 - interrupt-names: A list of interrupt names.
-		   For the R8A7795 SoC this property is mandatory;
+		   For the R8A779[56] SoCs this property is mandatory;
 		   it should include one entry per channel, named "ch%u",
 		   where %u is the channel number ranging from 0 to 24.
 		   For other SoCs this property is optional; if present
-- 
Regards,

Laurent Pinchart

[PATCH 3/4] arm64: dts: renesas: r8a7796: Add EthernetAVB instance

[Laurent Pinchart]

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm64/boot/dts/renesas/r8a7796.dtsi | 43 ++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index 788391db2a79..a52e869be204 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -226,6 +226,49 @@
 			#power-domain-cells = <1>;
 		};
 
+		avb: ethernet@e6800000 {
+			compatible = "renesas,etheravb-r8a7796",
+				     "renesas,etheravb-rcar-gen3";
+			reg = <0 0xe6800000 0 0x800>, <0 0xe6a00000 0 0x10000>;
+			interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "ch0", "ch1", "ch2", "ch3",
+					  "ch4", "ch5", "ch6", "ch7",
+					  "ch8", "ch9", "ch10", "ch11",
+					  "ch12", "ch13", "ch14", "ch15",
+					  "ch16", "ch17", "ch18", "ch19",
+					  "ch20", "ch21", "ch22", "ch23",
+					  "ch24";
+			clocks = <&cpg CPG_MOD 812>;
+			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+			phy-mode = "rgmii-id";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
 		scif2: serial@e6e88000 {
 			compatible = "renesas,scif-r8a7796",
 				     "renesas,rcar-gen3-scif", "renesas,scif";
-- 
Regards,

Laurent Pinchart

[PATCH 4/4] arm64: dts: r8a7796: Enable EthernetAVB on Salvator-X

[Laurent Pinchart]

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
index e72be3856d79..c22b329c4c52 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
@@ -17,6 +17,7 @@
 
 	aliases {
 		serial0 = &scif2;
+		ethernet0 = &avb;
 	};
 
 	chosen {
@@ -31,6 +32,30 @@
 	};
 };
 
+&avb {
+	renesas,no-ether-link;
+	phy-handle = <&phy0>;
+	status = "okay";
+
+	phy0: ethernet-phy@0 {
+		rxc-skew-ps = <900>;
+		rxdv-skew-ps = <0>;
+		rxd0-skew-ps = <0>;
+		rxd1-skew-ps = <0>;
+		rxd2-skew-ps = <0>;
+		rxd3-skew-ps = <0>;
+		txc-skew-ps = <900>;
+		txen-skew-ps = <0>;
+		txd0-skew-ps = <0>;
+		txd1-skew-ps = <0>;
+		txd2-skew-ps = <0>;
+		txd3-skew-ps = <0>;
+		reg = <0>;
+		interrupt-parent = <&gpio2>;
+		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+	};
+};
+
 &extal_clk {
 	clock-frequency = <16666666>;
 };
-- 
Regards,

Laurent Pinchart

Re: [PATCH 0/4] R-Car M3-W Salvator-X: Add ethernet support

[Geert Uytterhoeven]

Hi Laurent,

On Tue, Sep 6, 2016 at 10:25 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
>
> This patch series adds support for the RAVB ethernet controller on the M3-W
> (R8A7796) Salvator-X board.
>
> The patches are based on top of Simon's latest devel branch, with the
> following patches cherry-picked:
>
> [PATCH/RFT 1/8] clk: renesas: r8a7796: Add GPIO clocks
> [PATCH/RFT 4/8] gpio: rcar: Add r8a7796 (R-Car M3-W) support
> [PATCH/RFT 6/8] arm64: dts: r8a7796: Add GPIO device nodes

Thanks, very useful to have!

Howeveer, I thought the plan was to not add more hardware support to
r8a7796-salvator-x.dts that might not work with 64-bit memory, to avoid
this becoming a blocker when enabling 64-bit memory?

> I'd like to suggest merging the GPIO support without PFC if it helps getting
> ethernet support in v4.9, as this is a very handy feature for development.

In the mean time, Linus W. has pulled basic r8a7796 support from
git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
tags/sh-pfc-for-v4.9-tag2, so Simon can pull it as well, and queue pinctrl
patches for the devices that are already declared in r8a7796-salvator-x.dts.

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 1/4] clk: shmobile: r8a7796: Add RAVB clock

[Geert Uytterhoeven]

Hi Laurent,

On Tue, Sep 6, 2016 at 10:25 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
>  drivers/clk/renesas/r8a7796-cpg-mssr.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
> index cfd5ffb77dfe..868dfe30dfe7 100644
> --- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
> +++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
> @@ -99,6 +99,7 @@ static const struct cpg_core_clk r8a7796_core_clks[] __initconst = {
>  static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = {
>         DEF_MOD("scif2",                 310,   R8A7796_CLK_S3D4),
>         DEF_MOD("intc-ap",               408,   R8A7796_CLK_S3D1),
> +       DEF_MOD("etheravb",              812,   R8A7796_CLK_S3D2),

According to the datasheet, the parent clock on M3-W (and H3 ES2.0!) is S0D6,
not S3D2.

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 2/4] dt-bindings: net: renesas-ravb: Add support for R8A7796 RAVB

[Geert Uytterhoeven]

On Tue, Sep 6, 2016 at 10:25 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> Add a new compatible string for the R8A7796 (M3-W) RAVB.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.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 0/4] R-Car M3-W Salvator-X: Add ethernet support

[Simon Horman]

On Tue, Sep 06, 2016 at 10:53:20AM +0200, Geert Uytterhoeven wrote:
> Hi Laurent,
> 
> On Tue, Sep 6, 2016 at 10:25 AM, Laurent Pinchart
> <laurent.pinchart+renesas@ideasonboard.com> wrote:
> >
> > This patch series adds support for the RAVB ethernet controller on the M3-W
> > (R8A7796) Salvator-X board.
> >
> > The patches are based on top of Simon's latest devel branch, with the
> > following patches cherry-picked:
> >
> > [PATCH/RFT 1/8] clk: renesas: r8a7796: Add GPIO clocks
> > [PATCH/RFT 4/8] gpio: rcar: Add r8a7796 (R-Car M3-W) support
> > [PATCH/RFT 6/8] arm64: dts: r8a7796: Add GPIO device nodes
> 
> Thanks, very useful to have!
> 
> Howeveer, I thought the plan was to not add more hardware support to
> r8a7796-salvator-x.dts that might not work with 64-bit memory, to avoid
> this becoming a blocker when enabling 64-bit memory?

Yes, that is the plan.

I just queued up SDHI support locally.
Probably I should drop it for the reason above, right?

> > I'd like to suggest merging the GPIO support without PFC if it helps getting
> > ethernet support in v4.9, as this is a very handy feature for development.
> 
> In the mean time, Linus W. has pulled basic r8a7796 support from
> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
> tags/sh-pfc-for-v4.9-tag2, so Simon can pull it as well, and queue pinctrl
> patches for the devices that are already declared in r8a7796-salvator-x.dts.

Other than SDHI I have queued up (locally):

* arm64: dts: r8a7796: salvator-x: add serial console pins
* arm64: dts: r8a7796: Add pinctrl device node
* arm64: dts: r8a7795: salvator-x: Configure pins for the DU RGB output

Anything more/less?

Re: [PATCH 1/4] clk: shmobile: r8a7796: Add RAVB clock

[Laurent Pinchart]

Hi Geert,

On Tuesday 06 Sep 2016 10:59:47 Geert Uytterhoeven wrote:
> On Tue, Sep 6, 2016 at 10:25 AM, Laurent Pinchart wrote:
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> > 
> >  drivers/clk/renesas/r8a7796-cpg-mssr.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c
> > b/drivers/clk/renesas/r8a7796-cpg-mssr.c index cfd5ffb77dfe..868dfe30dfe7
> > 100644
> > --- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
> > +++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
> > @@ -99,6 +99,7 @@ static const struct cpg_core_clk r8a7796_core_clks[]
> > __initconst = {> 
> >  static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = {
> >         DEF_MOD("scif2",                 310,   R8A7796_CLK_S3D4),
> >         DEF_MOD("intc-ap",               408,   R8A7796_CLK_S3D1),
> > +       DEF_MOD("etheravb",              812,   R8A7796_CLK_S3D2),
> 
> According to the datasheet, the parent clock on M3-W (and H3 ES2.0!) is
> S0D6, not S3D2.

Indeed, I'll fix that.

Supporting H3 ES2.0 will be so much fun :-)

-- 
Regards,

Laurent Pinchart

Re: [PATCH 0/4] R-Car M3-W Salvator-X: Add ethernet support

[Laurent Pinchart]

Hi Geeert,

On Tuesday 06 Sep 2016 10:53:20 Geert Uytterhoeven wrote:
> On Tue, Sep 6, 2016 at 10:25 AM, Laurent Pinchart wrote:
> > This patch series adds support for the RAVB ethernet controller on the
> > M3-W (R8A7796) Salvator-X board.
> > 
> > The patches are based on top of Simon's latest devel branch, with the
> > following patches cherry-picked:
> > 
> > [PATCH/RFT 1/8] clk: renesas: r8a7796: Add GPIO clocks
> > [PATCH/RFT 4/8] gpio: rcar: Add r8a7796 (R-Car M3-W) support
> > [PATCH/RFT 6/8] arm64: dts: r8a7796: Add GPIO device nodes
> 
> Thanks, very useful to have!
> 
> Howeveer, I thought the plan was to not add more hardware support to
> r8a7796-salvator-x.dts that might not work with 64-bit memory, to avoid
> this becoming a blocker when enabling 64-bit memory?

We need to fix that ASAP for ethernet, as that's really a blocker for 
development.

> > I'd like to suggest merging the GPIO support without PFC if it helps
> > getting ethernet support in v4.9, as this is a very handy feature for
> > development.
>
> In the mean time, Linus W. has pulled basic r8a7796 support from
> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
> tags/sh-pfc-for-v4.9-tag2, so Simon can pull it as well, and queue pinctrl
> patches for the devices that are already declared in r8a7796-salvator-x.dts.

-- 
Regards,

Laurent Pinchart

[PATCH v1.1 1/4] clk: shmobile: r8a7796: Add RAVB clock

[Laurent Pinchart]

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
Changes since v1:

- Fixed parent clock

 drivers/clk/renesas/r8a7796-cpg-mssr.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
index cfd5ffb77dfe..e89c6d67fc10 100644
--- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
+++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
@@ -99,6 +99,7 @@ static const struct cpg_core_clk r8a7796_core_clks[] __initconst = {
 static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = {
 	DEF_MOD("scif2",		 310,	R8A7796_CLK_S3D4),
 	DEF_MOD("intc-ap",		 408,	R8A7796_CLK_S3D1),
+	DEF_MOD("etheravb",		 812,	R8A7796_CLK_S0D6),
 	DEF_MOD("gpio7",		 905,	R8A7796_CLK_S3D4),
 	DEF_MOD("gpio6",		 906,	R8A7796_CLK_S3D4),
 	DEF_MOD("gpio5",		 907,	R8A7796_CLK_S3D4),
-- 
Regards,

Laurent Pinchart

Re: [PATCH v1.1 1/4] clk: shmobile: r8a7796: Add RAVB clock

[Geert Uytterhoeven]

On Tue, Sep 6, 2016 at 3:57 PM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

(will queue in clk-renesas-for-v4.9)

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 v1.1 1/4] clk: shmobile: r8a7796: Add RAVB clock

[Geert Uytterhoeven]

On Mon, Sep 12, 2016 at 10:58 AM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Tue, Sep 6, 2016 at 3:57 PM, Laurent Pinchart
> <laurent.pinchart+renesas@ideasonboard.com> wrote:
>> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> (will queue in clk-renesas-for-v4.9)

... with s/shmobile/renesas/, of course.


-- 
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