[src/trunk]: src/sys/arch/arm/amlogic disable watchdog at startup

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

details:   https://anonhg.NetBSD.org/src/rev/7bb84d98dff4
branches:  trunk
changeset: 811991:7bb84d98dff4
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Nov 26 00:06:59 2015 +0000

description:
disable watchdog at startup

diffstat:

 sys/arch/arm/amlogic/amlogic_board.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r dd8adc4941cc -r 7bb84d98dff4 sys/arch/arm/amlogic/amlogic_board.c
--- a/sys/arch/arm/amlogic/amlogic_board.c      Wed Nov 25 20:25:20 2015 +0000
+++ b/sys/arch/arm/amlogic/amlogic_board.c      Thu Nov 26 00:06:59 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_board.c,v 1.15 2015/11/21 00:54:57 jmcneill Exp $ */
+/* $NetBSD: amlogic_board.c,v 1.16 2015/11/26 00:06:59 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "opt_amlogic.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.15 2015/11/21 00:54:57 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.16 2015/11/26 00:06:59 jmcneill Exp $");
 
 #define        _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
@@ -242,6 +242,10 @@
 void
 amlogic_wdog_init(void)
 {
+       /* Disable watchdog */
+       CBUS_WRITE(WATCHDOG_RESET_REG, 0);
+       CBUS_SET_CLEAR(WATCHDOG_TC_REG, 0, WATCHDOG_TC_ENABLE);
+
        sysmon_wdog_register(&amlogic_ee_wdog);
 }