watchdog: aspeed: restore default value of reset_mask

This is required for the current Linux kernel to reboot. It should also
probably be fixed in Linux.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/include/asm/arch-aspeed/wdt.h b/arch/arm/include/asm/arch-aspeed/wdt.h
index 8d6f292c8495e8ebf443e7bb320aa3967f0da25a..fb04d41d3cbf743403e44573c07cf7e4e9de1ec0 100644 (file)
--- a/arch/arm/include/asm/arch-aspeed/wdt.h
+++ b/arch/arm/include/asm/arch-aspeed/wdt.h
@@ -57,6 +57,15 @@
 #define WDT_RESET_SPI                  (1 << 24)
 #define WDT_RESET_MISC                 (1 << 25)
 
+#define WDT_RESET_DEFAULT                                              \
+       (WDT_RESET_ARM | WDT_RESET_COPROC | WDT_RESET_I2C |             \
+        WDT_RESET_MAC1 | WDT_RESET_MAC2 | WDT_RESET_GCRT |             \
+        WDT_RESET_USB20 | WDT_RESET_USB11_HOST | WDT_RESET_USB11_EHCI2 | \
+        WDT_RESET_VIDEO | WDT_RESET_HAC | WDT_RESET_LPC |              \
+        WDT_RESET_SDSDIO | WDT_RESET_MIC | WDT_RESET_CRT2C |           \
+        WDT_RESET_PWM | WDT_RESET_PECI | WDT_RESET_JTAG |              \
+        WDT_RESET_ADC | WDT_RESET_GPIO | WDT_RESET_MISC)
+
 #ifndef __ASSEMBLY__
 struct ast_wdt {
        u32 counter_status;

diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c
index 477605e7222dfb1e1a094019d5a685149ba39e71..59afa21efa4b5f77a1eacefc3007d79085fb8cdd 100644 (file)
--- a/drivers/watchdog/ast_wdt.c
+++ b/drivers/watchdog/ast_wdt.c
@@ -50,6 +50,7 @@ static int ast_wdt_stop(struct udevice *dev)
 
        clrbits_le32(&priv->regs->ctrl, WDT_CTRL_EN);
 
+       writel(WDT_RESET_DEFAULT, &priv->regs->reset_mask);
        return 0;
 }