With the integration of the Linux 7.2 device trees, the commit is no longer needed.
This reverts commit 771070a46adc6665c702b408b02229a7fb1b6989. Signed-off-by: Max Merchel <[email protected]> --- arch/arm/dts/imx6ul-tqma6ul-common-u-boot.dtsi | 32 ---------------------- arch/arm/dts/imx6ul-tqma6ul1-mba6ulx-u-boot.dtsi | 2 -- arch/arm/dts/imx6ul-tqma6ul2-mba6ulx-u-boot.dtsi | 2 -- arch/arm/dts/imx6ul-tqma6ul2l-mba6ulx-u-boot.dtsi | 2 -- arch/arm/dts/imx6ull-tqma6ull2-mba6ulx-u-boot.dtsi | 2 -- .../arm/dts/imx6ull-tqma6ull2l-mba6ulx-u-boot.dtsi | 2 -- arch/arm/dts/mba6ulx-u-boot.dtsi | 26 ------------------ 7 files changed, 68 deletions(-) diff --git a/arch/arm/dts/imx6ul-tqma6ul-common-u-boot.dtsi b/arch/arm/dts/imx6ul-tqma6ul-common-u-boot.dtsi index c9e6cef38a2..06bf91cf1ca 100644 --- a/arch/arm/dts/imx6ul-tqma6ul-common-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-tqma6ul-common-u-boot.dtsi @@ -22,14 +22,6 @@ }; }; -&clks { - bootph-pre-ram; -}; - -&flash0 { - bootph-pre-ram; -}; - &m24c64_50 { nvmem-layout { compatible = "fixed-layout"; @@ -41,27 +33,3 @@ }; }; }; - -&osc { - bootph-pre-ram; -}; - -&pinctrl_pmic { - bootph-pre-ram; -}; - -&pinctrl_qspi { - bootph-pre-ram; -}; - -&pinctrl_usdhc2 { - bootph-pre-ram; -}; - -&qspi { - bootph-pre-ram; -}; - -&usdhc2 { - bootph-pre-ram; -}; diff --git a/arch/arm/dts/imx6ul-tqma6ul1-mba6ulx-u-boot.dtsi b/arch/arm/dts/imx6ul-tqma6ul1-mba6ulx-u-boot.dtsi index 0917ecfd82a..b401f169db7 100644 --- a/arch/arm/dts/imx6ul-tqma6ul1-mba6ulx-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-tqma6ul1-mba6ulx-u-boot.dtsi @@ -5,6 +5,4 @@ * Author: Max Merchel */ -#include "imx6ul-u-boot.dtsi" #include "imx6ul-tqma6ul-common-u-boot.dtsi" -#include "mba6ulx-u-boot.dtsi" diff --git a/arch/arm/dts/imx6ul-tqma6ul2-mba6ulx-u-boot.dtsi b/arch/arm/dts/imx6ul-tqma6ul2-mba6ulx-u-boot.dtsi index 0917ecfd82a..b401f169db7 100644 --- a/arch/arm/dts/imx6ul-tqma6ul2-mba6ulx-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-tqma6ul2-mba6ulx-u-boot.dtsi @@ -5,6 +5,4 @@ * Author: Max Merchel */ -#include "imx6ul-u-boot.dtsi" #include "imx6ul-tqma6ul-common-u-boot.dtsi" -#include "mba6ulx-u-boot.dtsi" diff --git a/arch/arm/dts/imx6ul-tqma6ul2l-mba6ulx-u-boot.dtsi b/arch/arm/dts/imx6ul-tqma6ul2l-mba6ulx-u-boot.dtsi index 0917ecfd82a..b401f169db7 100644 --- a/arch/arm/dts/imx6ul-tqma6ul2l-mba6ulx-u-boot.dtsi +++ b/arch/arm/dts/imx6ul-tqma6ul2l-mba6ulx-u-boot.dtsi @@ -5,6 +5,4 @@ * Author: Max Merchel */ -#include "imx6ul-u-boot.dtsi" #include "imx6ul-tqma6ul-common-u-boot.dtsi" -#include "mba6ulx-u-boot.dtsi" diff --git a/arch/arm/dts/imx6ull-tqma6ull2-mba6ulx-u-boot.dtsi b/arch/arm/dts/imx6ull-tqma6ull2-mba6ulx-u-boot.dtsi index 21fb2ab4ae9..b401f169db7 100644 --- a/arch/arm/dts/imx6ull-tqma6ull2-mba6ulx-u-boot.dtsi +++ b/arch/arm/dts/imx6ull-tqma6ull2-mba6ulx-u-boot.dtsi @@ -5,6 +5,4 @@ * Author: Max Merchel */ -#include "imx6ull-u-boot.dtsi" #include "imx6ul-tqma6ul-common-u-boot.dtsi" -#include "mba6ulx-u-boot.dtsi" diff --git a/arch/arm/dts/imx6ull-tqma6ull2l-mba6ulx-u-boot.dtsi b/arch/arm/dts/imx6ull-tqma6ull2l-mba6ulx-u-boot.dtsi index 21fb2ab4ae9..b401f169db7 100644 --- a/arch/arm/dts/imx6ull-tqma6ull2l-mba6ulx-u-boot.dtsi +++ b/arch/arm/dts/imx6ull-tqma6ull2l-mba6ulx-u-boot.dtsi @@ -5,6 +5,4 @@ * Author: Max Merchel */ -#include "imx6ull-u-boot.dtsi" #include "imx6ul-tqma6ul-common-u-boot.dtsi" -#include "mba6ulx-u-boot.dtsi" diff --git a/arch/arm/dts/mba6ulx-u-boot.dtsi b/arch/arm/dts/mba6ulx-u-boot.dtsi deleted file mode 100644 index 73bed319ef2..00000000000 --- a/arch/arm/dts/mba6ulx-u-boot.dtsi +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT) -/* - * Copyright (c) 2024-2026 TQ-Systems GmbH <[email protected]>, - * D-82229 Seefeld, Germany. - * Author: Max Merchel - */ - -&uart1 { - bootph-pre-ram; -}; - -&pinctrl_uart1 { - bootph-pre-ram; -}; - -&usdhc1 { - bootph-pre-ram; -}; - -&pinctrl_usdhc1 { - bootph-pre-ram; -}; - -®_mba6ul_3v3 { - bootph-pre-ram; -}; -- 2.43.0
