diff options
| author | Tom Rini <trini@konsulko.com> | 2024-03-30 14:07:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-03-30 14:07:37 -0400 |
| commit | 425dc46a2c8ebe6d1a5a7d2d7ac5506aa7783409 (patch) | |
| tree | 9afc8cefa3f28efdaecfcc4cea378c87d88b6e2c /arch | |
| parent | 9468bf3a69b05bda05adb06f954b089ace301afc (diff) | |
| parent | fc07cac02adebc87b69cd82f6ca6f0283d11cd5a (diff) | |
Merge tag 'u-boot-imx-master-20240330' of https://gitlab.denx.de/u-boot/custodians/u-boot-imxmaster
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/20122
- Fix reset regression on mx6cuboxi and warp7.
- Fix Fix board revision detection on mx6cuboxi.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi | 10 | ||||
| -rw-r--r-- | arch/arm/dts/imx7s-warp-u-boot.dtsi | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi b/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi index 23a05773b5..e9b188ed65 100644 --- a/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi @@ -13,6 +13,12 @@ &gpio6 4 0 >; }; + + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + bootph-pre-ram; + }; }; &soc { @@ -58,3 +64,7 @@ &usdhc3 { bootph-all; }; + +&wdog1 { + bootph-pre-ram; +}; diff --git a/arch/arm/dts/imx7s-warp-u-boot.dtsi b/arch/arm/dts/imx7s-warp-u-boot.dtsi index 4f44598c9a..98784fd7a2 100644 --- a/arch/arm/dts/imx7s-warp-u-boot.dtsi +++ b/arch/arm/dts/imx7s-warp-u-boot.dtsi @@ -7,6 +7,12 @@ chosen { stdout-path = &uart1; }; + + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + bootph-pre-ram; + }; }; &aips3 { @@ -24,3 +30,7 @@ &uart1 { bootph-all; }; + +&wdog1 { + bootph-pre-ram; +}; |