Module Name: src
Committed By: jmcneill
Date: Sat Jan 19 20:52:26 UTC 2019
Modified Files:
src/sys/arch/arm/cortex: pl310.c
Log Message:
Remove hard requirement for "offset" property on Cortex-A5. This is not
required w/ FDT.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/cortex/pl310.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/pl310.c
diff -u src/sys/arch/arm/cortex/pl310.c:1.18 src/sys/arch/arm/cortex/pl310.c:1.19
--- src/sys/arch/arm/cortex/pl310.c:1.18 Wed Jun 20 08:03:55 2018
+++ src/sys/arch/arm/cortex/pl310.c Sat Jan 19 20:52:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pl310.c,v 1.18 2018/06/20 08:03:55 hkenken Exp $ */
+/* $NetBSD: pl310.c,v 1.19 2019/01/19 20:52:26 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pl310.c,v 1.18 2018/06/20 08:03:55 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pl310.c,v 1.19 2019/01/19 20:52:26 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -140,17 +140,8 @@ arml2cc_attach(device_t parent, device_t
aprint_naive("\n");
- if (!prop_dictionary_get_uint32(dict, "offset", &off)) {
- if (CPU_ID_CORTEX_A5_P(curcpu()->ci_arm_cpuid)) {
- /*
- * PL310 on Cortex-A5 is external to PERIPHBASE, so
- * "offset" property is required.
- */
- aprint_normal(": not configured\n");
- return;
- }
+ if (!prop_dictionary_get_uint32(dict, "offset", &off))
off = mpcaa->mpcaa_off1;
- }
arml2cc_sc = sc;
sc->sc_dev = self;
