[PATCH 1/3] ARM: shmobile: r8a7740: Correct name of DT Ethernet clock

[PATCH 1/3] ARM: shmobile: r8a7740: Correct name of DT Ethernet clock

[Geert Uytterhoeven]

The preferred node name in DT for an Ethernet device is "ethernet".
"sh-eth" was used in preliminary and incomplete bindings.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
This clock lookup entry should be removed after the conversion to CCF is
integrated.

 arch/arm/mach-shmobile/clock-r8a7740.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
index dd989f93498f..433ec674ead1 100644
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@ -596,7 +596,7 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("sh_mmcif",		&mstp_clks[MSTP312]),
 	CLKDEV_DEV_ID("e6bd0000.mmc",		&mstp_clks[MSTP312]),
 	CLKDEV_DEV_ID("r8a7740-gether",		&mstp_clks[MSTP309]),
-	CLKDEV_DEV_ID("e9a00000.sh-eth",	&mstp_clks[MSTP309]),
+	CLKDEV_DEV_ID("e9a00000.ethernet",	&mstp_clks[MSTP309]),
 	CLKDEV_DEV_ID("renesas-tpu-pwm",	&mstp_clks[MSTP304]),
 	CLKDEV_DEV_ID("e6600000.pwm",		&mstp_clks[MSTP304]),
 
-- 
1.7.9.5

[PATCH 2/3] ARM: shmobile: r8a7740 dtsi: Add Ethernet support

[Geert Uytterhoeven]

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
The "clocks" entry should be uncommented after the conversion to CCF is
integrated.

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

diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index 3834b94dc02a..560d8d71cea4 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -122,6 +122,19 @@
 			      0 149 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
+	ether: ethernet@e9a00000 {
+		compatible = "renesas,gether-r8a7740";
+		reg = <0xe9a00000 0x800>,
+		      <0xe9a01800 0x800>;
+		interrupt-parent = <&gic>;
+		interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;
+		/* clocks = <&mstp3_clks R8A7740_CLK_GETHER>; */
+		phy-mode = "mii";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "disabled";
+	};
+
 	i2c0: i2c@fff20000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
-- 
1.7.9.5

Re: [PATCH 2/3] ARM: shmobile: r8a7740 dtsi: Add Ethernet support

[Sergei Shtylyov]

Hello.

On 05/08/2014 12:32 AM, Geert Uytterhoeven wrote:

> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
> The "clocks" entry should be uncommented after the conversion to CCF is
> integrated.

>   arch/arm/boot/dts/r8a7740.dtsi |   13 +++++++++++++
>   1 file changed, 13 insertions(+)

> diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
> index 3834b94dc02a..560d8d71cea4 100644
> --- a/arch/arm/boot/dts/r8a7740.dtsi
> +++ b/arch/arm/boot/dts/r8a7740.dtsi
> @@ -122,6 +122,19 @@
>   			      0 149 IRQ_TYPE_LEVEL_HIGH>;
>   	};
>
> +	ether: ethernet@e9a00000 {

    Are you really going to refer to this node somewhere, using its label?

> +		compatible = "renesas,gether-r8a7740";
> +		reg = <0xe9a00000 0x800>,
> +		      <0xe9a01800 0x800>;
> +		interrupt-parent = <&gic>;
> +		interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;
> +		/* clocks = <&mstp3_clks R8A7740_CLK_GETHER>; */

    This property is mandatory, according to the bindings.

WBR, Sergei

Re: [PATCH 2/3] ARM: shmobile: r8a7740 dtsi: Add Ethernet support

[Geert Uytterhoeven]

Hi Sergei,

On Thu, May 8, 2014 at 3:00 PM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
>> +       ether: ethernet@e9a00000 {
>
>    Are you really going to refer to this node somewhere, using its label?

Yes, from r8a7740-armadillo800eva-reference.dts

>> +               compatible = "renesas,gether-r8a7740";
>> +               reg = <0xe9a00000 0x800>,
>> +                     <0xe9a01800 0x800>;
>> +               interrupt-parent = <&gic>;
>> +               interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;
>> +               /* clocks = <&mstp3_clks R8A7740_CLK_GETHER>; */
>
>    This property is mandatory, according to the bindings.

Indeed, but you cannot put anything there until the platform has CCF, as
mstp3_clks doesn't exist yet.
Currently it relies on a matching CLKDEV_DEV_ID() in platform code.

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/3] ARM: shmobile: r8a7740 dtsi: Add Ethernet support

[Sergei Shtylyov]

On 05/08/2014 05:06 PM, Geert Uytterhoeven wrote:

>>> +       ether: ethernet@e9a00000 {

>>     Are you really going to refer to this node somewhere, using its label?

> Yes, from r8a7740-armadillo800eva-reference.dts

    Ah, I completely forgot that there should be a board specific part of the 
node. Sorry.

>>> +               compatible = "renesas,gether-r8a7740";
>>> +               reg = <0xe9a00000 0x800>,
>>> +                     <0xe9a01800 0x800>;
>>> +               interrupt-parent = <&gic>;
>>> +               interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;
>>> +               /* clocks = <&mstp3_clks R8A7740_CLK_GETHER>; */

>>     This property is mandatory, according to the bindings.

> Indeed, but you cannot put anything there until the platform has CCF, as
> mstp3_clks doesn't exist yet.

    Yes, that was the main obstacle to accepting those bindings sooner. This 
patch therefore seems somewhat premature.

> Gr{oetje,eeting}s,
>                          Geert

WBR, Sergei

Re: [PATCH 2/3] ARM: shmobile: r8a7740 dtsi: Add Ethernet support

[Geert Uytterhoeven]

Hi Sergei,

On Thu, May 8, 2014 at 3:14 PM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
>>>> +               /* clocks = <&mstp3_clks R8A7740_CLK_GETHER>; */
>
>>>     This property is mandatory, according to the bindings.
>
>> Indeed, but you cannot put anything there until the platform has CCF, as
>> mstp3_clks doesn't exist yet.
>
>    Yes, that was the main obstacle to accepting those bindings sooner. This
> patch therefore seems somewhat premature.

My main objective is to provide working Ethernet support for Armadillo
reference now.

The DTS already has other nodes without "clocks" properties.

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/3] ARM: shmobile: r8a7740 dtsi: Add Ethernet support

[Sergei Shtylyov]

On 05/08/2014 05:21 PM, Geert Uytterhoeven wrote:

>>>>> +               /* clocks = <&mstp3_clks R8A7740_CLK_GETHER>; */

>>>>      This property is mandatory, according to the bindings.

>>> Indeed, but you cannot put anything there until the platform has CCF, as
>>> mstp3_clks doesn't exist yet.

>>     Yes, that was the main obstacle to accepting those bindings sooner. This
>> patch therefore seems somewhat premature.

> My main objective is to provide working Ethernet support for Armadillo
> reference now.

    Mine was the same (but for BOCK-W board) but DT people didn't give a damn. 
:-) So there's still no Ethernet support in BOCK-W DT.

> The DTS already has other nodes without "clocks" properties.

    It means not everybody submitting the bindings had the same bad luck as 
me. :-)

> Gr{oetje,eeting}s,
>                          Geert

WBR, Sergei

Re: [PATCH 2/3] ARM: shmobile: r8a7740 dtsi: Add Ethernet support

[Geert Uytterhoeven]

Hi Sergei,

On Thu, May 8, 2014 at 7:52 PM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
>>>>>> +               /* clocks = <&mstp3_clks R8A7740_CLK_GETHER>; */
>
>>>>>      This property is mandatory, according to the bindings.
>
>>>> Indeed, but you cannot put anything there until the platform has CCF, as
>>>> mstp3_clks doesn't exist yet.
>
>>>     Yes, that was the main obstacle to accepting those bindings sooner.
>>> This patch therefore seems somewhat premature.
>
>> My main objective is to provide working Ethernet support for Armadillo
>> reference now.
>
>    Mine was the same (but for BOCK-W board) but DT people didn't give a
> damn. :-) So there's still no Ethernet support in BOCK-W DT.

Yes there is: ethernet@18300000.

>> The DTS already has other nodes without "clocks" properties.
>
>    It means not everybody submitting the bindings had the same bad luck as me. :-)

I think we have to be pragmatic here. The clocks properties will be added to
the dtsi as soon as we have CCF support.

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/3] ARM: shmobile: r8a7740 dtsi: Add Ethernet support

[Sergei Shtylyov]

On 05/08/2014 10:46 PM, Geert Uytterhoeven wrote:

>>>>>>> +               /* clocks = <&mstp3_clks R8A7740_CLK_GETHER>; */

>>>>>>       This property is mandatory, according to the bindings.

>>>>> Indeed, but you cannot put anything there until the platform has CCF, as
>>>>> mstp3_clks doesn't exist yet.

>>>>      Yes, that was the main obstacle to accepting those bindings sooner.
>>>> This patch therefore seems somewhat premature.

>>> My main objective is to provide working Ethernet support for Armadillo
>>> reference now.

>>     Mine was the same (but for BOCK-W board) but DT people didn't give a
>> damn. :-) So there's still no Ethernet support in BOCK-W DT.

> Yes there is: ethernet@18300000.

    That's for an on-board SMSC911x, not for sh_eth.

>>> The DTS already has other nodes without "clocks" properties.

>>     It means not everybody submitting the bindings had the same bad luck as me. :-)

> I think we have to be pragmatic here. The clocks properties will be added to
> the dtsi as soon as we have CCF support.

    I'd agree, so if there's no objections from DT people, I won't object anymore.

> Gr{oetje,eeting}s,
>                          Geert

WBR, Sergei

Re: [PATCH 2/3] ARM: shmobile: r8a7740 dtsi: Add Ethernet support

[Geert Uytterhoeven]

Hi Sergey,

On Thu, May 8, 2014 at 8:52 PM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
>>>     Mine was the same (but for BOCK-W board) but DT people didn't give a
>>> damn. :-) So there's still no Ethernet support in BOCK-W DT.
>
>> Yes there is: ethernet@18300000.
>
>    That's for an on-board SMSC911x, not for sh_eth.

Oh, it has two Ethernet ports? Didn't know that.

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/3] ARM: shmobile: r8a7740 dtsi: Add Ethernet support

[Simon Horman]

On Thu, May 08, 2014 at 09:01:55PM +0200, Geert Uytterhoeven wrote:
> Hi Sergey,
> 
> On Thu, May 8, 2014 at 8:52 PM, Sergei Shtylyov
> <sergei.shtylyov@cogentembedded.com> wrote:
> >>>     Mine was the same (but for BOCK-W board) but DT people didn't give a
> >>> damn. :-) So there's still no Ethernet support in BOCK-W DT.
> >
> >> Yes there is: ethernet@18300000.
> >
> >    That's for an on-board SMSC911x, not for sh_eth.
> 
> Oh, it has two Ethernet ports? Didn't know that.

IIRC only the SMSC911x is exposed on the Bock-W board.

>From my point of view I would be happy to accept support for
the other port if there was some way (for someone to) verify it.
In particular to have the necessary hardware to test it.
I do not believe that I am in a position to do so myself at this time.

Re: [PATCH 2/3] ARM: shmobile: r8a7740 dtsi: Add Ethernet support

[Sergei Shtylyov]

Hello.

On 05/11/2014 05:00 AM, Simon Horman wrote:

>>>>>      Mine was the same (but for BOCK-W board) but DT people didn't give a
>>>>> damn. :-) So there's still no Ethernet support in BOCK-W DT.

>>>> Yes there is: ethernet@18300000.

>>>     That's for an on-board SMSC911x, not for sh_eth.

>> Oh, it has two Ethernet ports? Didn't know that.

> IIRC only the SMSC911x is exposed on the Bock-W board.

    Not really. You're probably mixing it with Marzen.

> From my point of view I would be happy to accept support for
> the other port if there was some way (for someone to) verify it.

    There is, and you have accepted such support in the legacy board file.
I had to postpone Ether DT support to the time when CCF support is available, 
though I have posted corresponding patches without the "clocks" property already.

WBR, Sergei

Re: [PATCH 2/3] ARM: shmobile: r8a7740 dtsi: Add Ethernet support

[Simon Horman]

On Sun, May 11, 2014 at 05:48:38PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 05/11/2014 05:00 AM, Simon Horman wrote:
> 
> >>>>>     Mine was the same (but for BOCK-W board) but DT people didn't give a
> >>>>>damn. :-) So there's still no Ethernet support in BOCK-W DT.
> 
> >>>>Yes there is: ethernet@18300000.
> 
> >>>    That's for an on-board SMSC911x, not for sh_eth.
> 
> >>Oh, it has two Ethernet ports? Didn't know that.
> 
> >IIRC only the SMSC911x is exposed on the Bock-W board.
> 
>    Not really. You're probably mixing it with Marzen.

Probably, sorry for my confusion.

> >From my point of view I would be happy to accept support for
> >the other port if there was some way (for someone to) verify it.
> 
>    There is, and you have accepted such support in the legacy board file.
> I had to postpone Ether DT support to the time when CCF support is
> available, though I have posted corresponding patches without the
> "clocks" property already.

Understood.

Re: [PATCH 2/3] ARM: shmobile: r8a7740 dtsi: Add Ethernet support

[Simon Horman]

On Thu, May 08, 2014 at 10:52:48PM +0400, Sergei Shtylyov wrote:
> On 05/08/2014 10:46 PM, Geert Uytterhoeven wrote:
> 
> >>>>>>>+               /* clocks = <&mstp3_clks R8A7740_CLK_GETHER>; */
> 
> >>>>>>      This property is mandatory, according to the bindings.
> 
> >>>>>Indeed, but you cannot put anything there until the platform has CCF, as
> >>>>>mstp3_clks doesn't exist yet.
> 
> >>>>     Yes, that was the main obstacle to accepting those bindings sooner.
> >>>>This patch therefore seems somewhat premature.
> 
> >>>My main objective is to provide working Ethernet support for Armadillo
> >>>reference now.
> 
> >>    Mine was the same (but for BOCK-W board) but DT people didn't give a
> >>damn. :-) So there's still no Ethernet support in BOCK-W DT.
> 
> >Yes there is: ethernet@18300000.
> 
>    That's for an on-board SMSC911x, not for sh_eth.
> 
> >>>The DTS already has other nodes without "clocks" properties.
> 
> >>    It means not everybody submitting the bindings had the same bad luck as me. :-)
> 
> >I think we have to be pragmatic here. The clocks properties will be added to
> >the dtsi as soon as we have CCF support.
> 
>    I'd agree, so if there's no objections from DT people, I won't object anymore.
> 

Hi Laurent, Hi Sergei,

I have queued up this series locally and I plan to push this once I have
done some testing (I am on a plane with neither internet access nor a
consignment of boards).

[PATCH 3/3] ARM: shmobile: armadillo-reference dts: Add Ethernet support

[Geert Uytterhoeven]

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 .../boot/dts/r8a7740-armadillo800eva-reference.dts |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
index 10344e6edd20..486007d7ffe4 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
@@ -158,6 +158,18 @@
 	};
 };
 
+&ether {
+	pinctrl-0 = <&ether_pins>;
+	pinctrl-names = "default";
+
+	phy-handle = <&phy0>;
+	status = "ok";
+
+	phy0: ethernet-phy@0 {
+		reg = <0>;
+	};
+};
+
 &i2c0 {
 	status = "okay";
 	touchscreen@55 {
@@ -189,6 +201,11 @@
 	pinctrl-0 = <&scifa1_pins>;
 	pinctrl-names = "default";
 
+	ether_pins: ether {
+		renesas,groups = "gether_mii", "gether_int";
+		renesas,function = "gether";
+	};
+
 	scifa1_pins: serial1 {
 		renesas,groups = "scifa1_data";
 		renesas,function = "scifa1";
-- 
1.7.9.5