Message ID | 20180906075153.7665-1-sebastien.szymanski@armadeus.com |
---|---|
State | Accepted |
Commit | 2f90c62c8ac09504ee2d94445bd425f35f6a60f3 |
Delegated to: | Stefano Babic |
Headers | show |
Series | [U-Boot,v3,1/1] ARM: opos6ul: make the board boot again | expand |
On Thu, Sep 06, 2018 at 09:51:53AM +0200, Sébastien Szymanski 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 into *-u-boot.dts files 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> Reviewed-by: Tom Rini <trini@konsulko.com>
On 06/09/2018 09:51, Sébastien Szymanski 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 into *-u-boot.dts files 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> > --- > > Changes for v3: > - use the automatic inclusion of -u-boot.dtsi mechanism of U-Boot. > > Changes for v2: > - put u-boot,dm-spl properties into -u-boot.dts files > > arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi | 28 ++++++++++++++++++++++++++++ > arch/arm/dts/imx6ul-opos6ul.dtsi | 2 -- > arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi | 24 ++++++++++++++++++++++++ > arch/arm/dts/imx6ul-opos6uldev.dts | 2 -- > 4 files changed, 52 insertions(+), 4 deletions(-) > create mode 100644 arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi > create mode 100644 arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi > > diff --git a/arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi b/arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi > new file mode 100644 > index 0000000000..4918de388e > --- /dev/null > +++ b/arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi > @@ -0,0 +1,28 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Device Tree Source extras for U-Boot for the OPOS6UL SoM > + * > + * Copyright (C) 2018 Armadeus Systems <support@armadeus.com> > + */ > + > +/ { > + soc { > + 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; > +}; > diff --git a/arch/arm/dts/imx6ul-opos6ul.dtsi b/arch/arm/dts/imx6ul-opos6ul.dtsi > index d51ad4de20..8f16a0a81c 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 > diff --git a/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi b/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi > new file mode 100644 > index 0000000000..da8b0392ef > --- /dev/null > +++ b/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi > @@ -0,0 +1,24 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Device Tree Source extras for U-Boot for the OPOS6ULDev board > + * > + * Copyright (C) 2018 Armadeus Systems <support@armadeus.com> > + */ > + > +#include "imx6ul-opos6ul-u-boot.dtsi" > + > +&aips1 { > + u-boot,dm-spl; > + > + spba-bus@02000000 { > + u-boot,dm-spl; > + }; > +}; > + > +&pinctrl_uart1 { > + u-boot,dm-spl; > +}; > + > +&uart1 { > + u-boot,dm-spl; > +}; > diff --git a/arch/arm/dts/imx6ul-opos6uldev.dts b/arch/arm/dts/imx6ul-opos6uldev.dts > index 9a51d1e54f..0e59ee57fd 100644 > --- a/arch/arm/dts/imx6ul-opos6uldev.dts > +++ b/arch/arm/dts/imx6ul-opos6uldev.dts > @@ -228,7 +228,6 @@ > }; > > &uart1 { > - u-boot,dm-spl; > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_uart1>; > status = "okay"; > @@ -374,7 +373,6 @@ > }; > > pinctrl_uart1: uart1grp { > - u-boot,dm-spl; > fsl,pins = < > MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1 > MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1 > Reviewed-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
Hello, On 09/06/2018 03:57 PM, Stefano Babic wrote: > On 06/09/2018 09:51, Sébastien Szymanski 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 into *-u-boot.dts files 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> >> --- >> >> Changes for v3: >> - use the automatic inclusion of -u-boot.dtsi mechanism of U-Boot. >> >> Changes for v2: >> - put u-boot,dm-spl properties into -u-boot.dts files >> >> arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi | 28 ++++++++++++++++++++++++++++ >> arch/arm/dts/imx6ul-opos6ul.dtsi | 2 -- >> arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi | 24 ++++++++++++++++++++++++ >> arch/arm/dts/imx6ul-opos6uldev.dts | 2 -- >> 4 files changed, 52 insertions(+), 4 deletions(-) >> create mode 100644 arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi >> create mode 100644 arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi >> [...] > > Reviewed-by: Stefano Babic <sbabic@denx.de> Is there still something preventing this patch to be applied ? Best regards, > > Best regards, > Stefano Babic >
diff --git a/arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi b/arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi new file mode 100644 index 0000000000..4918de388e --- /dev/null +++ b/arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the OPOS6UL SoM + * + * Copyright (C) 2018 Armadeus Systems <support@armadeus.com> + */ + +/ { + soc { + 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; +}; diff --git a/arch/arm/dts/imx6ul-opos6ul.dtsi b/arch/arm/dts/imx6ul-opos6ul.dtsi index d51ad4de20..8f16a0a81c 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 diff --git a/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi b/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi new file mode 100644 index 0000000000..da8b0392ef --- /dev/null +++ b/arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source extras for U-Boot for the OPOS6ULDev board + * + * Copyright (C) 2018 Armadeus Systems <support@armadeus.com> + */ + +#include "imx6ul-opos6ul-u-boot.dtsi" + +&aips1 { + u-boot,dm-spl; + + spba-bus@02000000 { + u-boot,dm-spl; + }; +}; + +&pinctrl_uart1 { + u-boot,dm-spl; +}; + +&uart1 { + u-boot,dm-spl; +}; diff --git a/arch/arm/dts/imx6ul-opos6uldev.dts b/arch/arm/dts/imx6ul-opos6uldev.dts index 9a51d1e54f..0e59ee57fd 100644 --- a/arch/arm/dts/imx6ul-opos6uldev.dts +++ b/arch/arm/dts/imx6ul-opos6uldev.dts @@ -228,7 +228,6 @@ }; &uart1 { - u-boot,dm-spl; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; status = "okay"; @@ -374,7 +373,6 @@ }; pinctrl_uart1: uart1grp { - u-boot,dm-spl; fsl,pins = < MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b1 MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b1
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 into *-u-boot.dts files 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> --- Changes for v3: - use the automatic inclusion of -u-boot.dtsi mechanism of U-Boot. Changes for v2: - put u-boot,dm-spl properties into -u-boot.dts files arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi | 28 ++++++++++++++++++++++++++++ arch/arm/dts/imx6ul-opos6ul.dtsi | 2 -- arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi | 24 ++++++++++++++++++++++++ arch/arm/dts/imx6ul-opos6uldev.dts | 2 -- 4 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi