[U-Boot] [PATCH V2] ARM: dts: imx6q-logicpd: Add missing imx6q-logicpd-u-boot for SPL
The SPL device tree is missing the entires for gpio1, uart1, usdhc1 and usdhc2. This creates the missing imx6q-logicpd-u-boot.dtsi file which will enable these functions so SPL can properly setup UART, detect microSD card, and startup.
Fixes: 8f4691e31a18 ("ARM: imx6q_logic: With SPL_OF_CONTROL enabled, remove MMC init")
Signed-off-by: Adam Ford aford173@gmail.com --- V2: Update MAINTAINER Remove unnecessary empty node. Update subject to reflect this was missing to imply it should have been there before.
diff --git a/arch/arm/dts/imx6q-logicpd-u-boot.dtsi b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi new file mode 100644 index 0000000000..625bed8f7d --- /dev/null +++ b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Logic PD aford173@gmail.com + */ + +#include "imx6qdl-u-boot.dtsi" + +&uart1 { + u-boot,dm-spl; +}; + +&usdhc1 { + u-boot,dm-spl; +}; + +&usdhc2 { + u-boot,dm-spl; +}; diff --git a/board/logicpd/imx6/MAINTAINERS b/board/logicpd/imx6/MAINTAINERS index 20ec5918e4..4280315269 100644 --- a/board/logicpd/imx6/MAINTAINERS +++ b/board/logicpd/imx6/MAINTAINERS @@ -7,3 +7,4 @@ F: configs/imx6q_logic_defconfig F: arch/arm/dts/imx6-logicpd-baseboard.dtsi F: arch/arm/dts/imx6-logicpd-som.dtsi F: arch/arm/dts/imx6q-logicpd.dts +F: arch/arm/dts/imx6q-logicpd-u-boot.dtsi
On Wed, Aug 7, 2019 at 10:16 AM Adam Ford aford173@gmail.com wrote:
The SPL device tree is missing the entires for gpio1, uart1, usdhc1 and usdhc2. This creates the missing imx6q-logicpd-u-boot.dtsi file which will enable these functions so SPL can properly setup UART, detect microSD card, and startup.
Stefano / Tom,
Is there any way we can pull this in for the next RC candidate? Without this patch, the imx6_logic boards are broken because I forgot to include this file in my original patch when I enabled SPL_OF_CONTROL. We can disregard the original patch for this V2 if helps clean up the to-do list in patchwork.
thank you,
adam
Fixes: 8f4691e31a18 ("ARM: imx6q_logic: With SPL_OF_CONTROL enabled, remove MMC init")
Signed-off-by: Adam Ford aford173@gmail.com
V2: Update MAINTAINER Remove unnecessary empty node. Update subject to reflect this was missing to imply it should have been there before.
diff --git a/arch/arm/dts/imx6q-logicpd-u-boot.dtsi b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi new file mode 100644 index 0000000000..625bed8f7d --- /dev/null +++ b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- Copyright (C) 2019 Logic PD aford173@gmail.com
- */
+#include "imx6qdl-u-boot.dtsi"
+&uart1 {
u-boot,dm-spl;+};
+&usdhc1 {
u-boot,dm-spl;+};
+&usdhc2 {
u-boot,dm-spl;+}; diff --git a/board/logicpd/imx6/MAINTAINERS b/board/logicpd/imx6/MAINTAINERS index 20ec5918e4..4280315269 100644 --- a/board/logicpd/imx6/MAINTAINERS +++ b/board/logicpd/imx6/MAINTAINERS @@ -7,3 +7,4 @@ F: configs/imx6q_logic_defconfig F: arch/arm/dts/imx6-logicpd-baseboard.dtsi F: arch/arm/dts/imx6-logicpd-som.dtsi F: arch/arm/dts/imx6q-logicpd.dts
+F: arch/arm/dts/imx6q-logicpd-u-boot.dtsi
2.17.1
On Mon, Aug 19, 2019 at 8:22 AM Adam Ford aford173@gmail.com wrote:
On Wed, Aug 7, 2019 at 10:16 AM Adam Ford aford173@gmail.com wrote:
The SPL device tree is missing the entires for gpio1, uart1, usdhc1 and usdhc2. This creates the missing imx6q-logicpd-u-boot.dtsi file which will enable these functions so SPL can properly setup UART, detect microSD card, and startup.
Stefano / Tom,
Is there any way we can pull this in for the next RC candidate? Without this patch, the imx6_logic boards are broken because I forgot to include this file in my original patch when I enabled SPL_OF_CONTROL. We can disregard the original patch for this V2 if helps clean up the to-do list in patchwork.
Pretty please, with sugar on top, can this patch be applied?
My board does not start without it, because I forgot to include it when I converted to use SPL_OF_CONTROL
thank you,
adam
Fixes: 8f4691e31a18 ("ARM: imx6q_logic: With SPL_OF_CONTROL enabled, remove MMC init")
Signed-off-by: Adam Ford aford173@gmail.com
V2: Update MAINTAINER Remove unnecessary empty node. Update subject to reflect this was missing to imply it should have been there before.
diff --git a/arch/arm/dts/imx6q-logicpd-u-boot.dtsi b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi new file mode 100644 index 0000000000..625bed8f7d --- /dev/null +++ b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- Copyright (C) 2019 Logic PD aford173@gmail.com
- */
+#include "imx6qdl-u-boot.dtsi"
+&uart1 {
u-boot,dm-spl;+};
+&usdhc1 {
u-boot,dm-spl;+};
+&usdhc2 {
u-boot,dm-spl;+}; diff --git a/board/logicpd/imx6/MAINTAINERS b/board/logicpd/imx6/MAINTAINERS index 20ec5918e4..4280315269 100644 --- a/board/logicpd/imx6/MAINTAINERS +++ b/board/logicpd/imx6/MAINTAINERS @@ -7,3 +7,4 @@ F: configs/imx6q_logic_defconfig F: arch/arm/dts/imx6-logicpd-baseboard.dtsi F: arch/arm/dts/imx6-logicpd-som.dtsi F: arch/arm/dts/imx6q-logicpd.dts
+F: arch/arm/dts/imx6q-logicpd-u-boot.dtsi
2.17.1
On Wed, Aug 07, 2019 at 10:16:33AM -0500, Adam Ford wrote:
The SPL device tree is missing the entires for gpio1, uart1, usdhc1 and usdhc2. This creates the missing imx6q-logicpd-u-boot.dtsi file which will enable these functions so SPL can properly setup UART, detect microSD card, and startup.
Fixes: 8f4691e31a18 ("ARM: imx6q_logic: With SPL_OF_CONTROL enabled, remove MMC init")
Signed-off-by: Adam Ford aford173@gmail.com
Applied to u-boot/master, thanks!
participants (2)
-
Adam Ford -
Tom Rini