leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

watchdog: aspeed: restore default value of reset_mask

Browse Source 
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>
This commit is contained in:
Cédric Le Goater 2018-10-16 13:57:11 +02:00 committed by Tom Rini
parent 290097fe27
commit e1a8dfde5a
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/include/asm/arch-aspeed/wdt.h
View File

@ -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;

1
drivers/watchdog/ast_wdt.c
View File

@ -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;
}