With the integration of the Linux 7.2 device trees, the commit is no longer needed.
This reverts commit 77375425023b141972091e8f2cd56c3b64c0c9df. Signed-off-by: Max Merchel <[email protected]> --- arch/arm/dts/imx7s-mba7-u-boot.dtsi | 21 --------------------- arch/arm/dts/imx7s-tqma7-u-boot.dtsi | 24 ------------------------ 2 files changed, 45 deletions(-) diff --git a/arch/arm/dts/imx7s-mba7-u-boot.dtsi b/arch/arm/dts/imx7s-mba7-u-boot.dtsi index bb560f4d85b..53f55304fea 100644 --- a/arch/arm/dts/imx7s-mba7-u-boot.dtsi +++ b/arch/arm/dts/imx7s-mba7-u-boot.dtsi @@ -21,28 +21,7 @@ }; }; -&gpio4 { - /* Deassert BOOT_EN after boot to separate BOOT_CFG circuits from LCD signals */ - boot-en-hog { - gpio-hog; - gpios = <3 GPIO_ACTIVE_LOW>; - output-low; - }; -}; - &wdog1 { u-boot,noautostart; timeout-sec = <60>; }; - -&iomuxc { - bootph-pre-ram; -}; - -&pinctrl_uart6 { - bootph-pre-ram; -}; - -&uart6 { - bootph-pre-ram; -}; diff --git a/arch/arm/dts/imx7s-tqma7-u-boot.dtsi b/arch/arm/dts/imx7s-tqma7-u-boot.dtsi index 2b6bbcc0276..934a4efade5 100644 --- a/arch/arm/dts/imx7s-tqma7-u-boot.dtsi +++ b/arch/arm/dts/imx7s-tqma7-u-boot.dtsi @@ -16,27 +16,3 @@ nvmem-cell-names = "device_info"; }; }; - -&m24c64 { - nvmem-layout { - compatible = "fixed-layout"; - #address-cells = <1>; - #size-cells = <1>; - - module_info: module-info@20 { - reg = <0x20 0x60>; - }; - }; -}; - -&soc { - bootph-pre-ram; -}; - -&aips1 { - bootph-pre-ram; -}; - -&aips3 { - bootph-pre-ram; -}; -- 2.43.0
