[src/trunk]: src/sys/arch/arm/marvell Actually, the WDT-expired bit in the IC...

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

details:   https://anonhg.NetBSD.org/src/rev/37ce5609dd09
branches:  trunk
changeset: 780409:37ce5609dd09
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sun Jul 22 19:35:04 2012 +0000

description:
Actually, the WDT-expired bit in the ICR needs to be cleared before enabling
watchdog reset.

diffstat:

 sys/arch/arm/marvell/mvsoctmr.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 9bd2b537174e -r 37ce5609dd09 sys/arch/arm/marvell/mvsoctmr.c
--- a/sys/arch/arm/marvell/mvsoctmr.c   Sun Jul 22 19:30:19 2012 +0000
+++ b/sys/arch/arm/marvell/mvsoctmr.c   Sun Jul 22 19:35:04 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mvsoctmr.c,v 1.7 2012/07/22 16:59:10 jakllsch Exp $    */
+/*     $NetBSD: mvsoctmr.c,v 1.8 2012/07/22 19:35:04 jakllsch Exp $    */
 /*
  * Copyright (c) 2007, 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsoctmr.c,v 1.7 2012/07/22 16:59:10 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsoctmr.c,v 1.8 2012/07/22 19:35:04 jakllsch Exp $");
 
 #include "opt_ddb.h"
 
@@ -146,6 +146,8 @@
         * stop watchdog timer, enable watchdog timer resets
         */
        mvsoctmr_cntl(sc, MVSOCTMR_WATCHDOG, 0xffffffff, 0, 0);
+       write_mlmbreg(MVSOC_MLMB_MLMBICR,
+           ~(1<<MVSOC_MLMB_MLMBI_CPUWDTIMERINTREQ));
        rstoutn = read_mlmbreg(MVSOC_MLMB_RSTOUTNMASKR);
        write_mlmbreg(MVSOC_MLMB_RSTOUTNMASKR,
                      rstoutn | MVSOC_MLMB_RSTOUTNMASKR_WDRSTOUTEN);