1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index 399c3fddecf6..0e67d96b3ebd 100644
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -20,6 +20,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/bitops.h>
+#include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/io.h>
@@ -90,6 +91,15 @@ static inline void ath79_wdt_keepalive(void)
 static inline void ath79_wdt_enable(void)
 {
         ath79_wdt_keepalive();
+
+        /*
+         * Updating the TIMER register requires a few microseconds
+         * on the AR934x SoCs at least. Use a small delay to ensure
+         * that the TIMER register is updated within the hardware
+         * before enabling the watchdog.
+         */
+        udelay(2);
+
         ath79_wdt_wr(WDOG_REG_CTRL, WDOG_CTRL_ACTION_FCR);
         /* flush write */
         ath79_wdt_rr(WDOG_REG_CTRL);