[src/trunk]: src/sys/arch/arm/cortex Don't attach a9tmr if the CPU supports t...

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

details:   https://anonhg.NetBSD.org/src/rev/daf5e63039ef
branches:  trunk
changeset: 787341:daf5e63039ef
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Jun 12 00:59:50 2013 +0000

description:
Don't attach a9tmr if the CPU supports the generic timer.

diffstat:

 sys/arch/arm/cortex/a9tmr.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 4f56d8869a3b -r daf5e63039ef sys/arch/arm/cortex/a9tmr.c
--- a/sys/arch/arm/cortex/a9tmr.c       Wed Jun 12 00:44:39 2013 +0000
+++ b/sys/arch/arm/cortex/a9tmr.c       Wed Jun 12 00:59:50 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: a9tmr.c,v 1.4 2012/11/29 17:36:56 matt Exp $   */
+/*     $NetBSD: a9tmr.c,v 1.5 2013/06/12 00:59:50 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.4 2012/11/29 17:36:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.5 2013/06/12 00:59:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -92,6 +92,9 @@
        if (a9tmr_sc.sc_dev != NULL)
                return 0;
 
+       if ((armreg_pfr1_read() & ARM_PFR1_GTIMER_MASK) != 0)
+               return 0;
+
        if (!CPU_ID_CORTEX_A9_P(curcpu()->ci_arm_cpuid))
                return 0;