imx233: always disable watchdog on boot

Change-Id: I2e81b038b783968aa18ef3398d6e2aa66a2fee7c

1 files changed, 19 insertions, 5 deletions

diff --git a/firmware/target/arm/imx233/rtc-imx233.h b/firmware/target/arm/imx233/rtc-imx233.h
index 8a5f4d035c..35304df080 100644
--- a/firmware/target/arm/imx233/rtc-imx233.h
+++ b/firmware/target/arm/imx233/rtc-imx233.h
@@ -37,11 +37,6 @@ struct imx233_rtc_info_t
     bool alarm_en, alarm_wake_en, alarm_wake, alarm_irq;
 };
 
-static inline void imx233_rtc_init(void)
-{
-    BF_CLR(RTC_CTRL, CLKGATE);
-}
-
 static inline uint32_t imx233_rtc_read_seconds(void)
 {
     return HW_RTC_SECONDS;
@@ -71,6 +66,25 @@ static inline uint32_t imx233_rtc_read_alarm(void)
     return HW_RTC_ALARM;
 }
 
+static inline void imx233_rtc_enable_watchdog(bool en)
+{
+    if(en)
+        BF_SET(RTC_CTRL, WATCHDOGEN);
+    else
+        BF_CLR(RTC_CTRL, WATCHDOGEN);
+}
+
+static inline void imx233_rtc_reset_watchdog(uint32_t ms)
+{
+    HW_RTC_WATCHDOG = ms;
+}
+
+static inline void imx233_rtc_init(void)
+{
+    BF_CLR(RTC_CTRL, CLKGATE);
+    imx233_rtc_enable_watchdog(false);
+}
+
 void imx233_rtc_write_seconds(uint32_t seconds);
 void imx233_rtc_write_persistent(int idx, uint32_t val);
 void imx233_rtc_write_alarm(uint32_t seconds);