Module Name: src Committed By: matt Date: Thu Nov 29 18:33:41 UTC 2012
Modified Files: src/sys/arch/arm/cortex [matt-nb6-plus]: a9tmr.c Log Message: Sync with HEAD. To generate a diff of this commit: cvs rdiff -u -r1.3.4.2 -r1.3.4.3 src/sys/arch/arm/cortex/a9tmr.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/arm/cortex/a9tmr.c diff -u src/sys/arch/arm/cortex/a9tmr.c:1.3.4.2 src/sys/arch/arm/cortex/a9tmr.c:1.3.4.3 --- src/sys/arch/arm/cortex/a9tmr.c:1.3.4.2 Wed Nov 28 22:40:25 2012 +++ src/sys/arch/arm/cortex/a9tmr.c Thu Nov 29 18:33:41 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: a9tmr.c,v 1.3.4.2 2012/11/28 22:40:25 matt Exp $ */ +/* $NetBSD: a9tmr.c,v 1.3.4.3 2012/11/29 18:33:41 matt Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.3.4.2 2012/11/28 22:40:25 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.3.4.3 2012/11/29 18:33:41 matt Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -196,7 +196,7 @@ a9tmr_init_cpu_clock(struct cpu_info *ci * Re-enable the comparator and now enable interrupts. */ a9tmr_global_write(sc, TMR_GBL_INT, 1); /* clear interrupt pending */ - ctl |= TMR_GBL_CTL_CMP_ENABLE | TMR_GBL_CTL_INT_ENABLE | TMR_GBL_CTL_AUTO_INC; + ctl |= TMR_GBL_CTL_CMP_ENABLE | TMR_GBL_CTL_INT_ENABLE | TMR_GBL_CTL_AUTO_INC | TMR_CTL_ENABLE; a9tmr_global_write(sc, TMR_GBL_CTL, ctl); #if 0 printf("%s: %s: ctl %#x autoinc %u cmp %#x%08x now %#"PRIx64"\n",