diff options
author | Marek Vasut <marex@denx.de> | 2019-06-09 18:46:45 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2019-07-19 20:14:50 +0200 |
commit | 9ac5dda519b297af683465bf169c7e5869c72b47 (patch) | |
tree | da2b31ad141872cbff152d922b0e28097415ea43 | |
parent | 1b8c986b684c481d2a3a87200e80421129abe32e (diff) | |
download | u-boot-9ac5dda519b297af683465bf169c7e5869c72b47.tar.gz |
ARM: imx: m53menlo: Convert WDT support to DM
Enable DM Watchdog support on iMX53 M53Menlo.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
-rw-r--r-- | arch/arm/dts/imx53-m53menlo-u-boot.dtsi | 5 | ||||
-rw-r--r-- | configs/m53menlo_defconfig | 2 | ||||
-rw-r--r-- | include/configs/m53menlo.h | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/dts/imx53-m53menlo-u-boot.dtsi b/arch/arm/dts/imx53-m53menlo-u-boot.dtsi index 329fa3b5e2..bc4b3483a6 100644 --- a/arch/arm/dts/imx53-m53menlo-u-boot.dtsi +++ b/arch/arm/dts/imx53-m53menlo-u-boot.dtsi @@ -11,6 +11,11 @@ u-boot,dm-pre-reloc; }; }; + + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + }; }; &gpio1 { diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig index 3a5fa26bcd..c551ea2daa 100644 --- a/configs/m53menlo_defconfig +++ b/configs/m53menlo_defconfig @@ -72,6 +72,8 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_RTC_M41T62=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_WATCHDOG=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_MX5=y diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 7b68c1c0a1..e98dbfbb7e 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -242,4 +242,9 @@ "fi ; " \ "fi\0" +#if defined(CONFIG_SPL_BUILD) +#undef CONFIG_WATCHDOG +#define CONFIG_HW_WATCHDOG +#endif + #endif /* __M53MENLO_CONFIG_H__ */ |