[PATCH] ARM: dts: colibri-imx6ull: fix mac address passing

[Marcel Ziswiler]

Hi guys

On Thu, 2021-09-23 at 07:57 -0400, Tom Rini wrote:
> On Thu, Sep 23, 2021 at 01:50:41PM +0200, Francesco Dolcini wrote:
> > On Thu, Sep 23, 2021 at 07:36:34AM -0400, Tom Rini wrote:
> > > On Thu, Sep 23, 2021 at 09:55:21AM +0200, Francesco Dolcini wrote:
> > > 
> > > > colibri-imx6ull ethernet device is fec2, while the optional secondary
> > > > ethernet is fec1, update the ethernet aliases in the .dts file so that
> > > > ethaddr is set to fec2 and eth1addr to fec1.
> > > > 
> > > > Without this change the ethernet interfaces have a different
> > > > mac address between Linux and U-Boot.
> > > > 
> > > > Signed-off-by: Francesco Dolcini <francesco.dolcini at toradex.com>
> > > > 
> > > > ---
> > > > 
> > > >  arch/arm/dts/imx6ull-colibri.dtsi | 6 ++++++
> > > >  1 file changed, 6 insertions(+)
> > > > 
> > > > diff --git a/arch/arm/dts/imx6ull-colibri.dtsi b/arch/arm/dts/imx6ull-colibri.dtsi
> > > > index b7bf79f28c..104207be97 100644
> > > > --- a/arch/arm/dts/imx6ull-colibri.dtsi
> > > > +++ b/arch/arm/dts/imx6ull-colibri.dtsi
> > > > @@ -8,6 +8,12 @@
> > > >  #include "imx6ull.dtsi"
> > > >  
> > > >  / {
> > > > +       /* Ethernet aliases to ensure correct MAC addresses */
> > > > +       aliases {
> > > > +               ethernet0 = &fec2;
> > > > +               ethernet1 = &fec1;
> > > > +       };
> > > > +
> > > >         chosen {
> > > >                 stdout-path = &uart1;
> > > >         };
> > > 
> > > The main dts* files aren't supposed to change between U-Boot and Linux.
> > > Is this re-syncing the file with current upstream then?  Thanks.
> > 
> > Currently they are out of sync, correct, and because of this difference on the
> > ethernet aliases we have the situation in which the MAC address assigned to the
> > ethernet interfaces is different between Linux an U-Boot.
> 
> OK, we can take this now as an important bugfix.

Any progress in applying this patch?

I just applied it again on today's master and it still cleanly applies.

> > There are other differences that this patchset is not trying to address and
> > that are not causing any known issues.
> 
> Please plan to sync the trees up for the next merge window, they are not
> supposed to stay out of sync.  Thanks.

Yes, we are in the process of doing that. Thanks!

Cheers

Marcel