From 7d6ca12313377bad4ceafc3fa1da414d101f6b77 Mon Sep 17 00:00:00 2001 From: Igor Opaniuk Date: Wed, 16 Oct 2019 13:39:35 +0300 Subject: ARM: dts: imx6ull-colibri: change hierarchy of DTS files Introduce imx6ull-colibri-u-boot.dtsi for u-boot specific properties to keep original imx6ull-colibri.dts in sync with Linux. Move all contents of imx6ull-colibri.dts to imx6ull-colibri.dtsi + additionally fix checkpatch warnings. Reviewed-by: Oleksandr Suvorov Reviewed-by: Fabio Estevam Signed-off-by: Igor Opaniuk --- arch/arm/dts/imx6ull-colibri-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 arch/arm/dts/imx6ull-colibri-u-boot.dtsi (limited to 'arch/arm/dts/imx6ull-colibri-u-boot.dtsi') diff --git a/arch/arm/dts/imx6ull-colibri-u-boot.dtsi b/arch/arm/dts/imx6ull-colibri-u-boot.dtsi new file mode 100644 index 0000000000..e81ac8cb27 --- /dev/null +++ b/arch/arm/dts/imx6ull-colibri-u-boot.dtsi @@ -0,0 +1,4 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright 2019 Toradex AG + */ -- cgit From 6b4339d312b716a8a01d244110ee76b7bc92b2c2 Mon Sep 17 00:00:00 2001 From: Igor Opaniuk Date: Wed, 16 Oct 2019 13:39:36 +0300 Subject: ARM: dts: imx6ull-colibri: pre-reloc for uart pinmux modes Add u-boot,dm-pre-reloc properties for uart pinmux configuration nodes, which enables UART as early as possible (before relocation). Without this we miss almost the half of output (U-boot version, CPU defails, Reset cause, DRAM details etc.). Fixes: cd69e8ef9b ("colibri-imx6ull: migrate pinctrl and regulators to dtb/dm") Reviewed-by: Oleksandr Suvorov Reviewed-by: Fabio Estevam Signed-off-by: Igor Opaniuk --- arch/arm/dts/imx6ull-colibri-u-boot.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'arch/arm/dts/imx6ull-colibri-u-boot.dtsi') diff --git a/arch/arm/dts/imx6ull-colibri-u-boot.dtsi b/arch/arm/dts/imx6ull-colibri-u-boot.dtsi index e81ac8cb27..531cdcc4da 100644 --- a/arch/arm/dts/imx6ull-colibri-u-boot.dtsi +++ b/arch/arm/dts/imx6ull-colibri-u-boot.dtsi @@ -2,3 +2,11 @@ /* * Copyright 2019 Toradex AG */ + +&pinctrl_uart1 { + u-boot,dm-pre-reloc; +}; + +&pinctrl_uart1_ctrl1 { + u-boot,dm-pre-reloc; +}; -- cgit