diff options
| author | Tom Rini <[email protected]> | 2025-03-13 16:45:19 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-03-13 16:45:19 -0600 |
| commit | bbfabe290138d76e78e0dac28fec93c32e3964eb (patch) | |
| tree | 86fe61d09018049f8e21f3a940b98eb5c8df7952 /arch/arm/dts | |
| parent | 9805321dfdeb5225fe5c5e0721abf49c0875637e (diff) | |
| parent | 21a4ac55c0d4eba836a45345d011093ffdc85b5c (diff) | |
Merge tag 'u-boot-imx-next-20250313' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/25142
- Support Toradex i.MX6 Apalis/Colibri v1.2 SoM.
- Guard tee.bin inclusion on imx9,
- Remove unneeded regulator entry on DH i.MX6 DHCOM DRC02 devicetree.
- Add i.MX mailbox driver
- Convert ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE to Kconfig.
- Cope with existing optee node on imx8m.
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi b/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi index 740a24d96ec..300e355c8ef 100644 --- a/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi @@ -27,11 +27,6 @@ }; }; -®_usb_otg_vbus { - gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; - enable-active-high; -}; - &wdog1 { bootph-pre-ram; }; |