diff options
| author | Fabio Estevam <festevam@denx.de> | 2023-08-08 18:40:39 -0300 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2023-10-16 16:25:10 +0200 |
| commit | 9043adee3ea67f4a71498e8f06023e3f63d7668f (patch) | |
| tree | af21dec1dd2b7768971cf3ae3e5f02f196ea0fc9 | |
| parent | 2f9b07d869da0a6a2f4d8780feb40da54148da2a (diff) | |
| download | u-boot-9043adee3ea67f4a71498e8f06023e3f63d7668f.zip u-boot-9043adee3ea67f4a71498e8f06023e3f63d7668f.tar.gz u-boot-9043adee3ea67f4a71498e8f06023e3f63d7668f.tar.bz2 | |
mx7dsabresd: Convert to watchdog driver model
Commit 68dcbdd594d4 ("ARM: imx: Add weak default reset_cpu()") caused
the 'reset' command in U-Boot to not cause a board reset.
Fix it by switching to the watchdog driver model via sysreset, which
is the preferred method for implementing the watchdog reset.
Signed-off-by: Fabio Estevam <festevam@denx.de>
Reviewed-by: Marek Vasut <marex@denx.de>
| -rw-r--r-- | arch/arm/dts/imx7d-sdb-u-boot.dtsi | 12 | ||||
| -rw-r--r-- | configs/mx7dsabresd_defconfig | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/dts/imx7d-sdb-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-u-boot.dtsi index b577730..71bfd80 100644 --- a/arch/arm/dts/imx7d-sdb-u-boot.dtsi +++ b/arch/arm/dts/imx7d-sdb-u-boot.dtsi @@ -2,6 +2,14 @@ #include "imx7s-u-boot.dtsi" +/ { + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + bootph-pre-ram; + }; +}; + &fec2 { status = "disable"; }; @@ -60,3 +68,7 @@ >; }; }; + +&wdog1 { + bootph-pre-ram; +}; diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig index 26e68d3..1c8105f 100644 --- a/configs/mx7dsabresd_defconfig +++ b/configs/mx7dsabresd_defconfig @@ -73,6 +73,8 @@ CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_SOFT_SPI=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_WATCHDOG=y CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y @@ -85,4 +87,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_IMX_WATCHDOG=y CONFIG_ERRNO_STR=y |