arm: dts: imx8mn-beacon-kit-u-boot: Fix broken booting

When the imx8mm.dtsi file was pulled in from Linux, the UARTs
were moved into an spba sub-node which wasn't being included
in the SPL device tree.  This meant the references to the UART
weren't being handled properly and when booting the system would
constantly reboot.  Fix this by adding the spba node to the spl
device tree to restore normal booting.

Fixes: 4e5114daf9eb ("imx8mn: synchronise device tree with linux")
Signed-off-by: Adam Ford <aford173@gmail.com>

Hi Adam

On Sun, Jul 31, 2022 at 7:16 PM Adam Ford <aford173@gmail.com> wrote:
>
> When the imx8mm.dtsi file was pulled in from Linux, the UARTs
> were moved into an spba sub-node which wasn't being included
> in the SPL device tree.  This meant the references to the UART
> weren't being handled properly and when booting the system would
> constantly reboot.  Fix this by adding the spba node to the spl
> device tree to restore normal booting.
>
> Fixes: 4e5114daf9eb ("imx8mn: synchronise device tree with linux")
> Signed-off-by: Adam Ford <aford173@gmail.com>
>
> diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> index 5f83952402..0efa6862eb 100644
> --- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> @@ -106,6 +106,10 @@
>         u-boot,off-on-delay-us = <20000>;
>  };
>
> +&spba1 {
> +       u-boot,dm-spl;
> +};
> +
>  &uart2 {
>         u-boot,dm-spl;
>  };
> --
> 2.34.1
>

Are you going to include it in imx8mn-u-boot.dtsi or do we need to
patch every single board?

Michael

On Sun, Jul 31, 2022 at 12:28 PM Michael Nazzareno Trimarchi
<michael@amarulasolutions.com> wrote:
>
> Hi Adam
>
> On Sun, Jul 31, 2022 at 7:16 PM Adam Ford <aford173@gmail.com> wrote:
> >
> > When the imx8mm.dtsi file was pulled in from Linux, the UARTs
> > were moved into an spba sub-node which wasn't being included
> > in the SPL device tree.  This meant the references to the UART
> > weren't being handled properly and when booting the system would
> > constantly reboot.  Fix this by adding the spba node to the spl
> > device tree to restore normal booting.
> >
> > Fixes: 4e5114daf9eb ("imx8mn: synchronise device tree with linux")
> > Signed-off-by: Adam Ford <aford173@gmail.com>
> >
> > diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> > index 5f83952402..0efa6862eb 100644
> > --- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> > +++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> > @@ -106,6 +106,10 @@
> >         u-boot,off-on-delay-us = <20000>;
> >  };
> >
> > +&spba1 {
> > +       u-boot,dm-spl;
> > +};
> > +
> >  &uart2 {
> >         u-boot,dm-spl;
> >  };
> > --
> > 2.34.1
> >
>
> Are you going to include it in imx8mn-u-boot.dtsi or do we need to
> patch every single board?

This is a temporary fix until I generate the common imx8mn-u-boot.dtsi
which will include this.

>
> Michael

On Sun, Jul 31, 2022 at 12:36 PM Adam Ford <aford173@gmail.com> wrote:
>
> On Sun, Jul 31, 2022 at 12:28 PM Michael Nazzareno Trimarchi
> <michael@amarulasolutions.com> wrote:
> >
> > Hi Adam
> >
> > On Sun, Jul 31, 2022 at 7:16 PM Adam Ford <aford173@gmail.com> wrote:
> > >
> > > When the imx8mm.dtsi file was pulled in from Linux, the UARTs
> > > were moved into an spba sub-node which wasn't being included
> > > in the SPL device tree.  This meant the references to the UART
> > > weren't being handled properly and when booting the system would
> > > constantly reboot.  Fix this by adding the spba node to the spl
> > > device tree to restore normal booting.
> > >
> > > Fixes: 4e5114daf9eb ("imx8mn: synchronise device tree with linux")
> > > Signed-off-by: Adam Ford <aford173@gmail.com>
> > >
> > > diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> > > index 5f83952402..0efa6862eb 100644
> > > --- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> > > +++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> > > @@ -106,6 +106,10 @@
> > >         u-boot,off-on-delay-us = <20000>;
> > >  };
> > >
> > > +&spba1 {
> > > +       u-boot,dm-spl;
> > > +};
> > > +
> > >  &uart2 {
> > >         u-boot,dm-spl;
> > >  };
> > > --
> > > 2.34.1
> > >
> >
> > Are you going to include it in imx8mn-u-boot.dtsi or do we need to
> > patch every single board?
>
> This is a temporary fix until I generate the common imx8mn-u-boot.dtsi
> which will include this.

I was hoping to finish this this afternoon, but a family emergency
came up.  I'm going to try to finish it later tonight or tomorrow.
It's taking a bit longer because there are some boards with DDR4,
LPDDR4 and DDR3.  I don't have most of them, but I plan to at least
generate a flash.bin file before posting it.

adam
>
> >
> > Michael

> When the imx8mm.dtsi file was pulled in from Linux, the UARTs
> were moved into an spba sub-node which wasn't being included
> in the SPL device tree.  This meant the references to the UART
> weren't being handled properly and when booting the system would
> constantly reboot.  Fix this by adding the spba node to the spl
> device tree to restore normal booting.
> Fixes: 4e5114daf9eb ("imx8mn: synchronise device tree with linux")
> Signed-off-by: Adam Ford <aford173@gmail.com>
> diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> index 5f83952402..0efa6862eb 100644
> --- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> @@ -106,6 +106,10 @@
>  	u-boot,off-on-delay-us = <20000>;
>  };
>  
> +&spba1 {
> +	u-boot,dm-spl;
> +};
> +
>  &uart2 {
>  	u-boot,dm-spl;
>  };
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic