| Message ID | 20240221173930.868473-1-festevam@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Fabio Estevam |
| Headers | show |
| Series | imx53-qsb: Convert to watchdog driver model | expand |
On Wed, Feb 21, 2024 at 2:39 PM Fabio Estevam <festevam@gmail.com> wrote: > > 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@gmail.com> Applied, thanks.
diff --git a/arch/arm/dts/imx53-qsb-u-boot.dtsi b/arch/arm/dts/imx53-qsb-u-boot.dtsi new file mode 100644 index 000000000000..593ab7caa635 --- /dev/null +++ b/arch/arm/dts/imx53-qsb-u-boot.dtsi @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/ { + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + bootph-pre-ram; + }; +}; + +&wdog1 { + bootph-pre-ram; +}; + diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index d4de8df7b49d..e2d3bc0b094e 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -60,6 +60,8 @@ CONFIG_POWER_FSL=y CONFIG_POWER_I2C=y CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_WATCHDOG=y CONFIG_USB=y CONFIG_USB_EHCI_MX5=y CONFIG_USB_STORAGE=y @@ -67,3 +69,4 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_IMX_WATCHDOG=y
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@gmail.com> --- arch/arm/dts/imx53-qsb-u-boot.dtsi | 14 ++++++++++++++ configs/mx53loco_defconfig | 3 +++ 2 files changed, 17 insertions(+) create mode 100644 arch/arm/dts/imx53-qsb-u-boot.dtsi