[src/trunk]: src/sys/arch/arm/cortex match on Cortex-A5

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

details:   https://anonhg.NetBSD.org/src/rev/a6cd2736c6d6
branches:  trunk
changeset: 336382:a6cd2736c6d6
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Feb 27 18:43:28 2015 +0000

description:
match on Cortex-A5

diffstat:

 sys/arch/arm/cortex/a9wdt.c     |  7 ++++---
 sys/arch/arm/cortex/armperiph.c |  3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 1165f3cbeaa9 -r a6cd2736c6d6 sys/arch/arm/cortex/a9wdt.c
--- a/sys/arch/arm/cortex/a9wdt.c       Fri Feb 27 18:26:49 2015 +0000
+++ b/sys/arch/arm/cortex/a9wdt.c       Fri Feb 27 18:43:28 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: a9wdt.c,v 1.2 2014/04/13 02:20:33 matt Exp $   */
+/*     $NetBSD: a9wdt.c,v 1.3 2015/02/27 18:43:28 jmcneill Exp $       */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: a9wdt.c,v 1.2 2014/04/13 02:20:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a9wdt.c,v 1.3 2015/02/27 18:43:28 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -94,7 +94,8 @@
        if (attached)
                return 0;
 
-       if (!CPU_ID_CORTEX_A9_P(curcpu()->ci_arm_cpuid))
+       if (!CPU_ID_CORTEX_A9_P(curcpu()->ci_arm_cpuid) &&
+           !CPU_ID_CORTEX_A5_P(curcpu()->ci_arm_cpuid))
                return 0;
 
        if (strcmp(mpcaa->mpcaa_name, cf->cf_name) != 0)
diff -r 1165f3cbeaa9 -r a6cd2736c6d6 sys/arch/arm/cortex/armperiph.c
--- a/sys/arch/arm/cortex/armperiph.c   Fri Feb 27 18:26:49 2015 +0000
+++ b/sys/arch/arm/cortex/armperiph.c   Fri Feb 27 18:43:28 2015 +0000
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: armperiph.c,v 1.5 2014/12/05 01:11:25 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: armperiph.c,v 1.6 2015/02/27 18:43:28 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -63,6 +63,7 @@
        { "armscu", 0x0000, 0 },
        { "armgic", 0x1000, 0x0100 },
        { "a9tmr",  0x0200, 0 },
+       { "a9wdt",   0x0600, 0 },
        { "", 0, 0 },
 };
 #endif