[U-Boot] [PATCH v3 1/1] ARM: opos6ul: make the board boot again

[Stefano Babic]

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 at 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 at 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 at armadeus.com>
> + */
> +
> +#include "imx6ul-opos6ul-u-boot.dtsi"
> +
> +&aips1 {
> +	u-boot,dm-spl;
> +
> +	spba-bus at 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 at denx.de>

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================