diff options
| author | Tom Rini <trini@konsulko.com> | 2024-04-20 15:16:17 -0600 | 
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-04-20 15:16:17 -0600 | 
| commit | c08685289171e68afd4bae2eb2e279cdc49a407d (patch) | |
| tree | 0bbed6c0795866a1b52d01dfe77c6dd15e7ba037 /arch/arm | |
| parent | b064bb66a10c850e231c7a124b90c8a26f99bd88 (diff) | |
| parent | 8b8c699d88171b0d40f072e114f32cce93cb2987 (diff) | |
Merge tag 'u-boot-imx-master-20240420' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI:
https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/20444
- Make i.MX93 boot less verbose.
- Remove unneedd environment variables from Toradex i.MX boards.
- Use gpio-hog on verdin-imx8mm/imx8mp.
- Add PCIe support for i.MX8MM.
- Add TPM support for imx8m*-venice.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi | 4 | 
2 files changed, 9 insertions, 0 deletions
| diff --git a/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi b/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi index 38db56059d6..8b397f535c1 100644 --- a/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi @@ -60,6 +60,11 @@  	ctrl-sleep-moci-hog {  		bootph-pre-ram; +		gpio-hog; +		output-high; +		gpios = <1 GPIO_ACTIVE_HIGH>; +		line-name = "CTRL_SLEEP_MOCI#"; +  	};  }; diff --git a/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi b/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi index 03f211d5f7d..7b45a87450b 100644 --- a/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi @@ -58,6 +58,10 @@  	ctrl-sleep-moci-hog {  		bootph-pre-ram; +		gpio-hog; +		output-high; +		gpios = <29 GPIO_ACTIVE_HIGH>; +		line-name = "CTRL_SLEEP_MOCI#";  	};  }; | 
