[GIT PULL] at91: fixes for 3.9-rc #2

[Nicolas Ferre]

On 03/26/2013 12:05 PM, Arnd Bergmann :
> On Tuesday 26 March 2013, Nicolas Ferre wrote:
>> Indeed, at first sight its looks like a nice solution. But I wonder if
>> we add several nodes in this kind of .dtsi files, we may end up with
>> mess between APB peripherals and board specific ones like leds, NAND, etc.
>> Moreover, the plain and full naming of the node makes it identifiable
>> without doubts, even someone not completely familiar with DT.
>>
>> I slightly prefer to keep it like this, but I can still change my mind ;-)
> 
> If you don't want to use the labels, it's probably better to drop from
> the dtsi files. I think you can also write 
> 
> ahb/apb/ethernet at 802c000 {
> 	phy-mode = "rmii";
>         status = "okay";
> };
> 
> although I think most people prefer the labels, and I have not tried
> the above.
> 
> Back to the bug fix, I think we can have a simpler version for 3.9
> if you just mark the ethernet node as "disabled" in the 
> at91sam9g15.dtsi file,

It will not work, the at91sam9g15.dtsi is included before the buggy
at91sam9x5ek.dtsi in the board .dts file.

Modifying only the at91sam9g15ek.dts and disabling it there will create
an awful mess:
macb0:
at91sam9x5.dtsi: status = "disabled";
at91sam9x5ek.dtsi: status = "okay";   <<-- bug!
at91sam9g15ek.dts: status = "disabled"; <<-- fix?

> and then do the patch to change the default
> in an add-on patch for 3.10.

If it is too late for this kernel revision, I would prefer to postpone
this modification and tag it for "stable" than have to deal with this
issue twice...

Bye,
-- 
Nicolas Ferre