On Friday, November 11, 2022 10:35:56 A.M. EST Tom Rini wrote:
> On Fri, Nov 11, 2022 at 10:28:43AM -0500, Detlev Casanova wrote:
> > On Thursday, October 27, 2022 2:30:51 P.M. EST Tom Rini wrote:
> > > On Thu, Oct 27, 2022 at 11:22:52AM -0400, Detlev Casanova wrote:
> > > > In commit d0399a46e7cda63c07e3eb8558bef84cfb068028, the device tree
> > > > was
> > > > synchronized from linux and the aliases were dropped.
> > > >
> > > > They need to be kept so that the mmc cards are in the right order.
> > > > Without the aliases, u-boot reports:
> > > > MMC: FSL_SDHC: 2, FSL_SDHC: 3
> > > >
> > > > With the aliases, u-boot reports:
> > > > MMC: FSL_SDHC: 0, FSL_SDHC: 1
> > > >
> > > > Signed-off-by: Detlev Casanova <detlev.casan...@collabora.com>
> > > > ---
> > > >
> > > > arch/arm/dts/imx6qdl-sabrelite.dtsi | 7 +++++++
> > > > 1 file changed, 7 insertions(+)
> > > >
> > > > diff --git a/arch/arm/dts/imx6qdl-sabrelite.dtsi
> > > > b/arch/arm/dts/imx6qdl-sabrelite.dtsi index 22f8e2783c..6564e3b82c
> > > > 100644
> > > > --- a/arch/arm/dts/imx6qdl-sabrelite.dtsi
> > > > +++ b/arch/arm/dts/imx6qdl-sabrelite.dtsi
> > > > @@ -10,6 +10,13 @@
> > > >
> > > > #include <dt-bindings/input/input.h>
> > > >
> > > > / {
> > > >
> > > > + aliases {
> > > > + mmc0 = &usdhc3;
> > > > + mmc1 = &usdhc4;
> > > > + pwm_lcd = &pwm1;
> > > > + pwm_lvds = &pwm4;
> > > > + };
> > > > +
> > > >
> > > > chosen {
> > > >
> > > > stdout-path = &uart2;
> > > >
> > > > };
> > >
> > > This really belongs in the upstream dts file so they aren't lost again
> > > and again.
> >
> > Forwaded to upstream kernel:
> > https://lore.kernel.org/lkml/20221028141811.101122-1-detlev.casanova@coll
> > abora.com/[1]
> >
> > Would it make sense to still add this one in u-boot before the devices
> > trees are copied again ?
> Yes, it would make sense to pick it up now to fix the regression here.
> Thanks for pushing it upstream!
Upstream linux won't apply it as they want to keep the already established
order in linux (the
SD card has to stay at mmc2). See
https://lore.kernel.org/all/a13c2e92-cfa6-04fd-c32a-c4d444894...@pengutronix.de/[1]
I guess we will have to adapt u-boot environment when these dts are synced
again.
Detlev.
--------
[1]
https://lore.kernel.org/all/a13c2e92-cfa6-04fd-c32a-c4d444894...@pengutronix.de/
