From 7915e150d6d070172f5e280373c7955d69012f16 Mon Sep 17 00:00:00 2001
From: Robert Beckett <bob.beckett@collabora.com>
Date: Tue, 12 Nov 2019 19:15:20 +0000
Subject: [PATCH] board: ge: mx53ppd: use imx wdt
Enable DM imx WDT
Enable SYSRESET_WATCHDOG to maintain WDT based reset ability
Signed-off-by: Robert Beckett <bob.beckett@collabora.com>
---
arch/arm/dts/imx53-ppd-uboot.dtsi | 12 ++++++++++++
arch/arm/dts/imx53-ppd.dts | 1 +
board/ge/mx53ppd/mx53ppd.c | 1 -
configs/mx53ppd_defconfig | 3 +++
4 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/dts/imx53-ppd-uboot.dtsi
diff --git a/arch/arm/dts/imx53-ppd-uboot.dtsi b/arch/arm/dts/imx53-ppd-uboot.dtsi
new file mode 100644
index 0000000000..88dd7e2939
--- /dev/null
+++ b/arch/arm/dts/imx53-ppd-uboot.dtsi
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
+/*
+ * Copyright 2019 Collabora Ltd
+ * Copyright 2019 General Electric Company
+ */
+
+/ {
+ wdt-reboot {
+ compatible = "wdt-reboot";
+ wdt = <&wdog1>;
+ };
+};
diff --git a/arch/arm/dts/imx53-ppd.dts b/arch/arm/dts/imx53-ppd.dts
index 8f3864998c..ae98361f9a 100644
--- a/arch/arm/dts/imx53-ppd.dts
+++ b/arch/arm/dts/imx53-ppd.dts
@@ -43,6 +43,7 @@
/dts-v1/;
#include "imx53.dtsi"
+#include "imx53-ppd-uboot.dtsi"
#include <dt-bindings/input/input.h>
/ {
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index bfcee441c5..105edd24cb 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/board/ge/mx53ppd/mx53ppd.c
@@ -297,7 +297,6 @@ int board_late_init(void)
return res;
print_cpuinfo();
- hw_watchdog_init();
check_time();
diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig
index 47481eaf60..7c44ea9be0 100644
--- a/configs/mx53ppd_defconfig
+++ b/configs/mx53ppd_defconfig
@@ -56,5 +56,8 @@ CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
CONFIG_IMX_WATCHDOG=y
+CONFIG_WDT=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_WATCHDOG=y
CONFIG_DM_REGULATOR=y
CONFIG_DM_USB=y
--
2.39.5