On Tue, Jan 07, 2025 at 03:44:04PM +1030, Andrew Jeffery wrote: > > >                 status = "okay"; > >                 m25p,fast-read; > > -               label = "bmc2"; > > +               label = "alt-bmc"; > >                 spi-rx-bus-width = <4>; > >                 spi-max-frequency = <50000000>; > >         }; > > I'm hitting conflicts (?) when I apply this on top of[1]. Do you mind > rebasing it? > > [1]: https://github.com/amboar/linux/tree/for/bmc/aspeed/dt Sure. It looks like someone elsewhere changed the spi-rx-bus-width which is causing the conflict. I'll resent a rebase. I'd like this backported to the openbmc tree also. Not sure which version is best for that tree right now. -- Patrick Williams