Message ID | 20180725100747.20762-1-sebastien.szymanski@armadeus.com |
---|---|
State | Superseded |
Delegated to: | Stefano Babic |
Headers | show |
Series | [U-Boot,1/1] ARM: dts: opos6ul: make the board boot again | expand |
On Wed, Jul 25, 2018 at 11:07 AM, Sébastien Szymanski <sebastien.szymanski@armadeus.com> wrote: > Commit 9faa43c4b5e5 ("ARM: dts: i.MX6UL: U-Boot specific dts for u-boot, > dm-spl") removes the u-boot,dm-spl properties from the imx6ul.dtsi file > and breaks the OPOS6UL board. > Add the u-boot,dm-spl properties to make the board boot again. These should go into a imx6ul-opos6ul-u-boot.dtsi file so that when dt files are synced from the kernel things like this aren't lost (again). There's a number of examples of how that is done there. Peter > Fixes: commit 9faa43c4b5e5 ("ARM: dts: i.MX6UL: U-Boot specific dts for u-boot, dm-spl") > Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> > --- > arch/arm/dts/imx6ul-opos6ul.dtsi | 33 +++++++++++++++++++++++++++++++-- > 1 file changed, 31 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/dts/imx6ul-opos6ul.dtsi b/arch/arm/dts/imx6ul-opos6ul.dtsi > index d51ad4de20..7023842315 100644 > --- a/arch/arm/dts/imx6ul-opos6ul.dtsi > +++ b/arch/arm/dts/imx6ul-opos6ul.dtsi > @@ -99,7 +99,6 @@ > > /* eMMC */ > &usdhc1 { > - u-boot,dm-spl; > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_usdhc1>; > bus-width = <8>; > @@ -162,7 +161,6 @@ > }; > > pinctrl_usdhc1: usdhc1grp { > - u-boot,dm-spl; > fsl,pins = < > MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059 > MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059 > @@ -192,3 +190,34 @@ > >; > }; > }; > + > +/* Specific to U-Boot */ > +/ { > + soc { > + u-boot,dm-spl; > + }; > +}; > + > +&aips1 { > + u-boot,dm-spl; > + > + spba-bus@02000000 { > + u-boot,dm-spl; > + }; > +}; > + > +&aips2 { > + u-boot,dm-spl; > +}; > + > +&iomuxc { > + u-boot,dm-spl; > +}; > + > +&pinctrl_usdhc1 { > + u-boot,dm-spl; > +}; > + > +&usdhc1 { > + u-boot,dm-spl; > +}; > -- > 2.16.4 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
diff --git a/arch/arm/dts/imx6ul-opos6ul.dtsi b/arch/arm/dts/imx6ul-opos6ul.dtsi index d51ad4de20..7023842315 100644 --- a/arch/arm/dts/imx6ul-opos6ul.dtsi +++ b/arch/arm/dts/imx6ul-opos6ul.dtsi @@ -99,7 +99,6 @@ /* eMMC */ &usdhc1 { - u-boot,dm-spl; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1>; bus-width = <8>; @@ -162,7 +161,6 @@ }; pinctrl_usdhc1: usdhc1grp { - u-boot,dm-spl; fsl,pins = < MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059 MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059 @@ -192,3 +190,34 @@ >; }; }; + +/* Specific to U-Boot */ +/ { + soc { + u-boot,dm-spl; + }; +}; + +&aips1 { + u-boot,dm-spl; + + spba-bus@02000000 { + u-boot,dm-spl; + }; +}; + +&aips2 { + u-boot,dm-spl; +}; + +&iomuxc { + u-boot,dm-spl; +}; + +&pinctrl_usdhc1 { + u-boot,dm-spl; +}; + +&usdhc1 { + u-boot,dm-spl; +};
Commit 9faa43c4b5e5 ("ARM: dts: i.MX6UL: U-Boot specific dts for u-boot, dm-spl") removes the u-boot,dm-spl properties from the imx6ul.dtsi file and breaks the OPOS6UL board. Add the u-boot,dm-spl properties to make the board boot again. Fixes: commit 9faa43c4b5e5 ("ARM: dts: i.MX6UL: U-Boot specific dts for u-boot, dm-spl") Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com> --- arch/arm/dts/imx6ul-opos6ul.dtsi | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)