diff options
| author | Tom Rini <trini@konsulko.com> | 2023-10-19 09:39:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-19 09:39:00 -0400 |
| commit | 48bc9de28228a0fdd30a10f59f23e6a24cb75636 (patch) | |
| tree | 513818a9c8de52c19d6fc0d4cdd9703ab8954827 /drivers | |
| parent | 9a0cf3993f71043ba08c315572c54622de42d447 (diff) | |
| parent | 127d03893bd51f855e1a277e31a8258105ace42a (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-watchdog
- sandbox: watchdog: Avoid an error on startup (Simon)
- nuvoton: Fix reset/expire function error (Jim)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/npcm_wdt.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/watchdog/npcm_wdt.c b/drivers/watchdog/npcm_wdt.c index e56aa0ebe1d..57b61215a2a 100644 --- a/drivers/watchdog/npcm_wdt.c +++ b/drivers/watchdog/npcm_wdt.c @@ -69,15 +69,21 @@ static int npcm_wdt_stop(struct udevice *dev) static int npcm_wdt_reset(struct udevice *dev) { struct npcm_wdt_priv *priv = dev_get_priv(dev); + u32 val; - writel(NPCM_WTR | NPCM_WTRE | NPCM_WTE, priv->regs); + val = readl(priv->regs); + writel(val | NPCM_WTR, priv->regs); return 0; } static int npcm_wdt_expire_now(struct udevice *dev, ulong flags) { - return npcm_wdt_reset(dev); + struct npcm_wdt_priv *priv = dev_get_priv(dev); + + writel(NPCM_WTR | NPCM_WTRE | NPCM_WTE, priv->regs); + + return 0; } static int npcm_wdt_of_to_plat(struct udevice *dev) |