summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMarcus Glocker <mglocker@cvs.openbsd.org>2016-09-04 11:57:00 +0000
committerMarcus Glocker <mglocker@cvs.openbsd.org>2016-09-04 11:57:00 +0000
commit239cbae0a86a17ae06c7cb3bbd78d7292eed2689 (patch)
tree5796bf22a69f7f2d8e868414a9363d67b8700c41 /sys
parent9392cb372f1d74334454677353ff303a8bf2f573 (diff)
For the allwinner,sun4i-a10-wdt disable/enable the reset-bit instead of
the enable-bit. Fixes system reboot ('reboot failed; spinning') seen on the allwinner,sun5i-r8. Suggested and ok kettenis
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/armv7/sunxi/sxidog.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/armv7/sunxi/sxidog.c b/sys/arch/armv7/sunxi/sxidog.c
index f4cddb8e054..ad31692a34d 100644
--- a/sys/arch/armv7/sunxi/sxidog.c
+++ b/sys/arch/armv7/sunxi/sxidog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sxidog.c,v 1.9 2016/08/27 14:13:14 kettenis Exp $ */
+/* $OpenBSD: sxidog.c,v 1.10 2016/09/04 11:56:59 mglocker Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
*
@@ -148,9 +148,9 @@ sxidog_callback(void *arg, int period)
switch (sc->sc_type) {
case SXIDOG_A10:
- enable = (period > 0) ? WDOG_EN : 0;
+ enable = (period > 0) ? WDOG_RST_EN : 0;
SXIWRITE4(sc, WDOG_MODE_REG,
- enable | WDOG_RST_EN | WDOG_INTV_VALUE(period));
+ enable | WDOG_EN | WDOG_INTV_VALUE(period));
SXIWRITE4(sc, WDOG_CTRL_REG, WDOG_KEY | WDOG_RSTART);
break;
case SXIDOG_A31: