[PATCH 0/2] Add R8A7790 EtherAVB DT support

[PATCH 0/2] Add R8A7790 EtherAVB DT support

[Sergei Shtylyov]

Hello.

   Here's the set of 2 patches against Simon Horman's 'renesas.git' repo,
'renesas-devel-20150330-v4.0-rc6' tag. Here we add the EtherAVB device tree
support for the R8A7790 SoC. The 2nd patch depends on the EtherAVB driver
posted recently for the bindings.

[1/2] ARM: shmobile: r8a7790: add EtherAVB clocks
[2/2] ARM: shmobile: r8a7790: add EtherAVB DT support

WBR, Sergei

[PATCH 1/2] ARM: shmobile: r8a7790: add EtherAVB clock

[Sergei Shtylyov]

Add the EtherAVB clock to the R8A7790 device tree.

Based on original patch by Mitsuhiro Kimura <mitsuhiro.kimura.kc@renesas.com>.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
 arch/arm/boot/dts/r8a7790.dtsi            |    8 +++++---
 include/dt-bindings/clock/r8a7790-clock.h |    1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

Index: renesas/arch/arm/boot/dts/r8a7790.dtsi
=================================--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi
+++ renesas/arch/arm/boot/dts/r8a7790.dtsi
@@ -1193,16 +1193,18 @@
 			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
 			clocks = <&hp_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>,
-			         <&zg_clk>, <&p_clk>, <&zs_clk>, <&zs_clk>;
+			         <&zg_clk>, <&p_clk>, <&hp_clk>, <&zs_clk>,
+				 <&zs_clk>;
 			#clock-cells = <1>;
 			clock-indices = <
 				R8A7790_CLK_MLB R8A7790_CLK_VIN3 R8A7790_CLK_VIN2
-				R8A7790_CLK_VIN1 R8A7790_CLK_VIN0 R8A7790_CLK_ETHER
+				R8A7790_CLK_VIN1 R8A7790_CLK_VIN0
+				R8A7790_CLK_ETHER R8A7790_CLK_ETHERAVB
 				R8A7790_CLK_SATA1 R8A7790_CLK_SATA0
 			>;
 			clock-output-names  				"mlb", "vin3", "vin2", "vin1", "vin0", "ether",
-				"sata1", "sata0";
+				"etheravb", "sata1", "sata0";
 		};
 		mstp9_clks: mstp9_clks@e6150994 {
 			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
Index: renesas/include/dt-bindings/clock/r8a7790-clock.h
=================================--- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h
+++ renesas/include/dt-bindings/clock/r8a7790-clock.h
@@ -105,6 +105,7 @@
 #define R8A7790_CLK_VIN2		9
 #define R8A7790_CLK_VIN1		10
 #define R8A7790_CLK_VIN0		11
+#define R8A7790_CLK_ETHERAVB		12
 #define R8A7790_CLK_ETHER		13
 #define R8A7790_CLK_SATA1		14
 #define R8A7790_CLK_SATA0		15

[PATCH 2/2] ARM: shmobile: r8a7790: add EtherAVB DT support

[Sergei Shtylyov]

Define the generic R8A7790 part of the EtherAVB device node. 

Based on original patch by Mitsuhiro Kimura <mitsuhiro.kimura.kc@renesas.com>.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
 arch/arm/boot/dts/r8a7790.dtsi |   10 ++++++++++
 1 file changed, 10 insertions(+)

Index: renesas/arch/arm/boot/dts/r8a7790.dtsi
=================================--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi
+++ renesas/arch/arm/boot/dts/r8a7790.dtsi
@@ -626,6 +626,16 @@
 		status = "disabled";
 	};
 
+	avb: ethernet@e6800000 {
+		compatible = "renesas,ravb-r8a7790";
+		reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
+		interrupts = <0 163 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&mstp8_clks R8A7790_CLK_ETHERAVB>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
 	sata0: sata@ee300000 {
 		compatible = "renesas,sata-r8a7790";
 		reg = <0 0xee300000 0 0x2000>;

Re: [PATCH 2/2] ARM: shmobile: r8a7790: add EtherAVB DT support

[Simon Horman]

On Tue, Mar 31, 2015 at 12:59:41AM +0300, Sergei Shtylyov wrote:
> Define the generic R8A7790 part of the EtherAVB device node. 

Please repost once this binding (and associated driver) has been accepted.

> Based on original patch by Mitsuhiro Kimura <mitsuhiro.kimura.kc@renesas.com>.
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> 
> ---
>  arch/arm/boot/dts/r8a7790.dtsi |   10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi
> =================================> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi
> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi
> @@ -626,6 +626,16 @@
>  		status = "disabled";
>  	};
>  
> +	avb: ethernet@e6800000 {
> +		compatible = "renesas,ravb-r8a7790";
> +		reg = <0 0xe6800000 0 0x800>, <0 0xee0e8000 0 0x4000>;
> +		interrupts = <0 163 IRQ_TYPE_LEVEL_HIGH>;
> +		clocks = <&mstp8_clks R8A7790_CLK_ETHERAVB>;
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +		status = "disabled";
> +	};
> +
>  	sata0: sata@ee300000 {
>  		compatible = "renesas,sata-r8a7790";
>  		reg = <0 0xee300000 0 0x2000>;
> 

Re: [PATCH 2/2] ARM: shmobile: r8a7790: add EtherAVB DT support

[Sergei Shtylyov]

Hello.

On 03/31/2015 03:21 AM, Simon Horman wrote:

>> Define the generic R8A7790 part of the EtherAVB device node.

> Please repost once this binding (and associated driver) has been accepted.

    OK, but will you merge patch #1?

>> Based on original patch by Mitsuhiro Kimura <mitsuhiro.kimura.kc@renesas.com>.

>> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>>
>> ---
>>   arch/arm/boot/dts/r8a7790.dtsi |   10 ++++++++++
>>   1 file changed, 10 insertions(+)
>>
>> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi
>> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi
>> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi
>> @@ -626,6 +626,16 @@
>>   		status = "disabled";
>>   	};
>>
>> +	avb: ethernet@e6800000 {
>> +		compatible = "renesas,ravb-r8a7790";

    I went the usual way here but I suspect that SoC part of the prop should 
be "-rcar-gen2" as we now have this IP core (as well as most of the others, 
except PFC) described in a common manual for the R-Car generation 2 SoCs.
What do you think?

WBR, Sergei

Re: [PATCH 2/2] ARM: shmobile: r8a7790: add EtherAVB DT support

[Simon Horman]

On Tue, Mar 31, 2015 at 06:04:43PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 03/31/2015 03:21 AM, Simon Horman wrote:
> 
> >>Define the generic R8A7790 part of the EtherAVB device node.
> 
> >Please repost once this binding (and associated driver) has been accepted.
> 
>    OK, but will you merge patch #1?

I would prefer to wait until we can exercise it with a driver.

> >>Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >>
> >>---
> >>  arch/arm/boot/dts/r8a7790.dtsi |   10 ++++++++++
> >>  1 file changed, 10 insertions(+)
> >>
> >>Index: renesas/arch/arm/boot/dts/r8a7790.dtsi
> >>=================================> >>--- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi
> >>+++ renesas/arch/arm/boot/dts/r8a7790.dtsi
> >>@@ -626,6 +626,16 @@
> >>  		status = "disabled";
> >>  	};
> >>
> >>+	avb: ethernet@e6800000 {
> >>+		compatible = "renesas,ravb-r8a7790";
> 
>    I went the usual way here but I suspect that SoC part of the prop should
> be "-rcar-gen2" as we now have this IP core (as well as most of the others,
> except PFC) described in a common manual for the R-Car generation 2 SoCs.
> What do you think?

I like -r8a7790.

Re: [PATCH 1/2] ARM: shmobile: r8a7790: add EtherAVB clock

[Geert Uytterhoeven]

Hi Sergei,

On Mon, Mar 30, 2015 at 11:58 PM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi
> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi
> @@ -1193,16 +1193,18 @@
>                         compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
>                         reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
>                         clocks = <&hp_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>,
> -                                <&zg_clk>, <&p_clk>, <&zs_clk>, <&zs_clk>;
> +                                <&zg_clk>, <&p_clk>, <&hp_clk>, <&zs_clk>,
> +                                <&zs_clk>;

For consistency, please insert the new etheravb entry between vin0 and ether,
cfr. the order in r8a7790-clock.h.

>                         #clock-cells = <1>;
>                         clock-indices = <
>                                 R8A7790_CLK_MLB R8A7790_CLK_VIN3 R8A7790_CLK_VIN2
> -                               R8A7790_CLK_VIN1 R8A7790_CLK_VIN0 R8A7790_CLK_ETHER
> +                               R8A7790_CLK_VIN1 R8A7790_CLK_VIN0
> +                               R8A7790_CLK_ETHER R8A7790_CLK_ETHERAVB
>                                 R8A7790_CLK_SATA1 R8A7790_CLK_SATA0
>                         >;
>                         clock-output-names >                                 "mlb", "vin3", "vin2", "vin1", "vin0", "ether",
> -                               "sata1", "sata0";
> +                               "etheravb", "sata1", "sata0";
>                 };
>                 mstp9_clks: mstp9_clks@e6150994 {
>                         compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
> Index: renesas/include/dt-bindings/clock/r8a7790-clock.h
> =================================> --- renesas.orig/include/dt-bindings/clock/r8a7790-clock.h
> +++ renesas/include/dt-bindings/clock/r8a7790-clock.h
> @@ -105,6 +105,7 @@
>  #define R8A7790_CLK_VIN2               9
>  #define R8A7790_CLK_VIN1               10
>  #define R8A7790_CLK_VIN0               11
> +#define R8A7790_CLK_ETHERAVB           12
>  #define R8A7790_CLK_ETHER              13
>  #define R8A7790_CLK_SATA1              14
>  #define R8A7790_CLK_SATA0              15

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/2] ARM: shmobile: r8a7790: add EtherAVB DT support

[Sergei Shtylyov]

Hello.

On 4/2/2015 4:33 AM, Simon Horman wrote:

>> On 03/31/2015 03:21 AM, Simon Horman wrote:

>>>> Define the generic R8A7790 part of the EtherAVB device node.

>>> Please repost once this binding (and associated driver) has been accepted.

>>     OK, but will you merge patch #1?

> I would prefer to wait until we can exercise it with a driver.

    Then you'll have to wait long as the Lager board doesn't have support for 
Ethernet AVB. We've only tested it with the daughter boards.

WBR, Sergei

Re: [PATCH 2/2] ARM: shmobile: r8a7790: add EtherAVB DT support

[Simon Horman]

On Thu, Apr 02, 2015 at 02:31:19PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 4/2/2015 4:33 AM, Simon Horman wrote:
> 
> >>On 03/31/2015 03:21 AM, Simon Horman wrote:
> 
> >>>>Define the generic R8A7790 part of the EtherAVB device node.
> 
> >>>Please repost once this binding (and associated driver) has been accepted.
> 
> >>    OK, but will you merge patch #1?
> 
> >I would prefer to wait until we can exercise it with a driver.
> 
>    Then you'll have to wait long as the Lager board doesn't have support for
> Ethernet AVB. We've only tested it with the daughter boards.

All the same, I'd rather wait for the driver to be merged first.