[src/trunk]: src/sys/arch/arm/omap Put omapwdt32k(4) in known state (disarmed...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/853e762b1d6f
branches:  trunk
changeset: 344837:853e762b1d6f
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sat Apr 23 17:05:30 2016 +0000

description:
Put omapwdt32k(4) in known state (disarmed) on attach.

Some newer U-Boot builds for am335x_evm (BeagleBone) hand us the hardware
with an armed watchdog.

diffstat:

 sys/arch/arm/omap/obio_wdt.c |  15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diffs (30 lines):

diff -r a13db76c91e3 -r 853e762b1d6f sys/arch/arm/omap/obio_wdt.c
--- a/sys/arch/arm/omap/obio_wdt.c      Sat Apr 23 15:47:54 2016 +0000
+++ b/sys/arch/arm/omap/obio_wdt.c      Sat Apr 23 17:05:30 2016 +0000
@@ -33,7 +33,7 @@
 #include "opt_omap.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio_wdt.c,v 1.6 2012/09/05 00:19:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_wdt.c,v 1.7 2016/04/23 17:05:30 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -101,4 +101,17 @@
            (1 << WD_SYSCONFIG_AUTOIDLE);
        bus_space_write_4(omapwdt32k_sc->sc_iot, omapwdt32k_sc->sc_ioh,
                          WD_SYSCONFIG, omapwdt_sysconfig);
+
+       /*
+        * Put watchdog in known (disarmed) state.
+        *
+        * Some U-Boot versions on BeagleBone will leave the watchdog
+        * armed at boot.
+        * 
+        * XXX Revisit this, perhaps we should just start tickling an
+        * armed watchdog.
+        */
+
+       sc->sc_armed = -1;
+       omapwdt32k_enable(0);
 }