Module Name: src
Committed By: jmcneill
Date: Fri Feb 27 18:43:28 UTC 2015
Modified Files:
src/sys/arch/arm/cortex: a9wdt.c armperiph.c
Log Message:
match on Cortex-A5
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/cortex/a9wdt.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/cortex/armperiph.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/a9wdt.c
diff -u src/sys/arch/arm/cortex/a9wdt.c:1.2 src/sys/arch/arm/cortex/a9wdt.c:1.3
--- src/sys/arch/arm/cortex/a9wdt.c:1.2 Sun Apr 13 02:20:33 2014
+++ src/sys/arch/arm/cortex/a9wdt.c Fri Feb 27 18:43:28 2015
@@ -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 @@ a9wdt_match(device_t parent, cfdata_t cf
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)
Index: src/sys/arch/arm/cortex/armperiph.c
diff -u src/sys/arch/arm/cortex/armperiph.c:1.5 src/sys/arch/arm/cortex/armperiph.c:1.6
--- src/sys/arch/arm/cortex/armperiph.c:1.5 Fri Dec 5 01:11:25 2014
+++ src/sys/arch/arm/cortex/armperiph.c Fri Feb 27 18:43:28 2015
@@ -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 @@ static const struct armperiph_info a5_de
{ "armscu", 0x0000, 0 },
{ "armgic", 0x1000, 0x0100 },
{ "a9tmr", 0x0200, 0 },
+ { "a9wdt", 0x0600, 0 },
{ "", 0, 0 },
};
#endif
