diff mbox

[for,3.14] ARM: at91: fix network interface ordering for sama5d36

Message ID 1394462238-22313-1-git-send-email-nicolas.ferre@atmel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Nicolas Ferre March 10, 2014, 2:37 p.m. UTC
From: Boris BREZILLON <b.brezillon.dev@gmail.com>

On the newly introduced sama5d36, Gigabit and 10/100 Ethernet network
interfaces are probed in a different order than for the sama5d35.
Moreover, users are accustomed to this order in bootloaders and backports
for older kernel revisions.
So this patch switches DT node order as it is done for the other dual-Ethernet
sama5d3 SoC.
Better interface numbering which does not depend on DT node order is being
developed for stronger interface identification.

Signed-off-by: Boris BREZILLON <b.brezillon.dev@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Olof, Arnd and Kevin,

I would like to include this fix in 3.14-final.
I do not have anymore patch for an at91-3.14-fixes branch so I only send this
single patch to you. Can you still take it?

Thanks, best regards,

 arch/arm/boot/dts/sama5d36.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Olof Johansson March 11, 2014, 7:49 p.m. UTC | #1
On Mon, Mar 10, 2014 at 03:37:18PM +0100, Nicolas Ferre wrote:
> From: Boris BREZILLON <b.brezillon.dev@gmail.com>
> 
> On the newly introduced sama5d36, Gigabit and 10/100 Ethernet network
> interfaces are probed in a different order than for the sama5d35.
> Moreover, users are accustomed to this order in bootloaders and backports
> for older kernel revisions.
> So this patch switches DT node order as it is done for the other dual-Ethernet
> sama5d3 SoC.
> Better interface numbering which does not depend on DT node order is being
> developed for stronger interface identification.
> 
> Signed-off-by: Boris BREZILLON <b.brezillon.dev@gmail.com>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> Olof, Arnd and Kevin,
> 
> I would like to include this fix in 3.14-final.
> I do not have anymore patch for an at91-3.14-fixes branch so I only send this
> single patch to you. Can you still take it?

Sure, applied now.


-Olof
Jean-Christophe PLAGNIOL-VILLARD March 11, 2014, 8:56 p.m. UTC | #2
On Mar 10, 2014, at 10:37 PM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:

> From: Boris BREZILLON <b.brezillon.dev@gmail.com>
> 
> On the newly introduced sama5d36, Gigabit and 10/100 Ethernet network
> interfaces are probed in a different order than for the sama5d35.
> Moreover, users are accustomed to this order in bootloaders and backports
> for older kernel revisions.
> So this patch switches DT node order as it is done for the other dual-Ethernet
> sama5d3 SoC.
> Better interface numbering which does not depend on DT node order is being
> developed for stronger interface identification.

twick ethernet enumerating by playing on the DT order is week

It’s better to introduce a new property

linux,ethernet-id or something like or simply rely on other information on the userspace to identify the
proper interface

Nicolas for AT91 keep me in Cc

Best Regards,
J.
> 
> Signed-off-by: Boris BREZILLON <b.brezillon.dev@gmail.com>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> Olof, Arnd and Kevin,
> 
> I would like to include this fix in 3.14-final.
> I do not have anymore patch for an at91-3.14-fixes branch so I only send this
> single patch to you. Can you still take it?
> 
> Thanks, best regards,
> 
> arch/arm/boot/dts/sama5d36.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/sama5d36.dtsi b/arch/arm/boot/dts/sama5d36.dtsi
> index 6c31c26e6cc0..db58cad6acd3 100644
> --- a/arch/arm/boot/dts/sama5d36.dtsi
> +++ b/arch/arm/boot/dts/sama5d36.dtsi
> @@ -8,8 +8,8 @@
>  */
> #include "sama5d3.dtsi"
> #include "sama5d3_can.dtsi"
> -#include "sama5d3_emac.dtsi"
> #include "sama5d3_gmac.dtsi"
> +#include "sama5d3_emac.dtsi"
> #include "sama5d3_lcd.dtsi"
> #include "sama5d3_mci2.dtsi"
> #include "sama5d3_tcb1.dtsi"
> -- 
> 1.8.2.2
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Nicolas Ferre March 12, 2014, 7:59 a.m. UTC | #3
On 11/03/2014 21:56, Jean-Christophe PLAGNIOL-VILLARD :
> 
> On Mar 10, 2014, at 10:37 PM, Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
> 
>> From: Boris BREZILLON <b.brezillon.dev@gmail.com>
>>
>> On the newly introduced sama5d36, Gigabit and 10/100 Ethernet network
>> interfaces are probed in a different order than for the sama5d35.
>> Moreover, users are accustomed to this order in bootloaders and backports
>> for older kernel revisions.
>> So this patch switches DT node order as it is done for the other dual-Ethernet
>> sama5d3 SoC.
>> Better interface numbering which does not depend on DT node order is being
>> developed for stronger interface identification.
> 
> twick ethernet enumerating by playing on the DT order is week

Absolutely, that is what I said in the commit message.

> It’s better to introduce a new property
> 
> linux,ethernet-id or something like or simply rely on other information on the userspace to identify the
> proper interface

We will rely on the alias number ; It's its purpose, after all. I think
that Boris already have a preliminary patch for the macb driver.

Bye,

> Nicolas for AT91 keep me in Cc
> 
> Best Regards,
> J.
>>
>> Signed-off-by: Boris BREZILLON <b.brezillon.dev@gmail.com>
>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>> ---
>> Olof, Arnd and Kevin,
>>
>> I would like to include this fix in 3.14-final.
>> I do not have anymore patch for an at91-3.14-fixes branch so I only send this
>> single patch to you. Can you still take it?
>>
>> Thanks, best regards,
>>
>> arch/arm/boot/dts/sama5d36.dtsi | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/boot/dts/sama5d36.dtsi b/arch/arm/boot/dts/sama5d36.dtsi
>> index 6c31c26e6cc0..db58cad6acd3 100644
>> --- a/arch/arm/boot/dts/sama5d36.dtsi
>> +++ b/arch/arm/boot/dts/sama5d36.dtsi
>> @@ -8,8 +8,8 @@
>>  */
>> #include "sama5d3.dtsi"
>> #include "sama5d3_can.dtsi"
>> -#include "sama5d3_emac.dtsi"
>> #include "sama5d3_gmac.dtsi"
>> +#include "sama5d3_emac.dtsi"
>> #include "sama5d3_lcd.dtsi"
>> #include "sama5d3_mci2.dtsi"
>> #include "sama5d3_tcb1.dtsi"
>> -- 
>> 1.8.2.2
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 
>
diff mbox

Patch

diff --git a/arch/arm/boot/dts/sama5d36.dtsi b/arch/arm/boot/dts/sama5d36.dtsi
index 6c31c26e6cc0..db58cad6acd3 100644
--- a/arch/arm/boot/dts/sama5d36.dtsi
+++ b/arch/arm/boot/dts/sama5d36.dtsi
@@ -8,8 +8,8 @@ 
  */
 #include "sama5d3.dtsi"
 #include "sama5d3_can.dtsi"
-#include "sama5d3_emac.dtsi"
 #include "sama5d3_gmac.dtsi"
+#include "sama5d3_emac.dtsi"
 #include "sama5d3_lcd.dtsi"
 #include "sama5d3_mci2.dtsi"
 #include "sama5d3_tcb1.dtsi"