Module Name: src
Committed By: jmcneill
Date: Sat Feb 28 18:50:15 UTC 2015
Modified Files:
src/sys/arch/evbarm/amlogic: amlogic_machdep.c
Log Message:
access watchdog with AMLOGIC_CBUS_OFFSET offset
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/amlogic/amlogic_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/amlogic/amlogic_machdep.c
diff -u src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.7 src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.8
--- src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.7 Sat Feb 28 15:21:07 2015
+++ src/sys/arch/evbarm/amlogic/amlogic_machdep.c Sat Feb 28 18:50:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_machdep.c,v 1.7 2015/02/28 15:21:07 jmcneill Exp $ */
+/* $NetBSD: amlogic_machdep.c,v 1.8 2015/02/28 18:50:15 jmcneill Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_machdep.c,v 1.7 2015/02/28 15:21:07 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_machdep.c,v 1.8 2015/02/28 18:50:15 jmcneill Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -492,11 +492,12 @@ void
amlogic_reset(void)
{
bus_space_tag_t bst = &amlogic_bs_tag;
- bus_space_handle_t bsh = amlogic_core_bsh;
+ bus_space_handle_t bsh = amlogic_core_bsh;
+ bus_size_t off = AMLOGIC_CBUS_OFFSET;
- bus_space_write_4(bst, bsh, WATCHDOG_TC_REG,
+ bus_space_write_4(bst, bsh, off + WATCHDOG_TC_REG,
WATCHDOG_TC_CPUS | WATCHDOG_TC_ENABLE | 1);
- bus_space_write_4(bst, bsh, WATCHDOG_RESET_REG, 0);
+ bus_space_write_4(bst, bsh, off + WATCHDOG_RESET_REG, 0);
for (;;) {
__asm("wfi");
