diff options
| author | Fabio Estevam <festevam@denx.de> | 2023-10-26 18:01:53 -0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-12-12 16:33:57 -0500 |
| commit | 43bf6a692f7af8782fdc6f6c21cb4e8356b75435 (patch) | |
| tree | 4d2fea7a45bc6da75e974a5a6ce6fe697af6d805 | |
| parent | e0dfb3417348d68a0f6032ce45d6e33015bd292c (diff) | |
| download | u-boot-43bf6a692f7af8782fdc6f6c21cb4e8356b75435.zip u-boot-43bf6a692f7af8782fdc6f6c21cb4e8356b75435.tar.gz u-boot-43bf6a692f7af8782fdc6f6c21cb4e8356b75435.tar.bz2 | |
pico-pi-imx7d: 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>
| -rw-r--r-- | arch/arm/dts/imx7d-pico-pi-u-boot.dtsi | 10 | ||||
| -rw-r--r-- | configs/pico-pi-imx7d_defconfig | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi b/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi index 843b458..c685682 100644 --- a/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi +++ b/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi @@ -6,6 +6,12 @@ usb0 = &usbotg1; display0 = &lcdif; }; + + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + bootph-pre-ram; + }; }; &usbotg1 { @@ -45,6 +51,10 @@ }; }; +&wdog1 { + bootph-pre-ram; +}; + &iomuxc { pinctrl_backlight: backlight { fsl,pins = < diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig index 48364c7..5b615da 100644 --- a/configs/pico-pi-imx7d_defconfig +++ b/configs/pico-pi-imx7d_defconfig @@ -76,6 +76,8 @@ CONFIG_DM_PMIC=y CONFIG_DM_PMIC_PFUZE100=y CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_WATCHDOG=y CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_SPL_USB_HOST=y @@ -95,3 +97,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_BMP_16BPP=y +CONFIG_IMX_WATCHDOG=y |