[src/trunk]: src/sys/arch/arm/cortex Remove hard requirement for "offset" pro...

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

details:   https://anonhg.NetBSD.org/src/rev/e955269f27a2
branches:  trunk
changeset: 447635:e955269f27a2
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Jan 19 20:52:26 2019 +0000

description:
Remove hard requirement for "offset" property on Cortex-A5. This is not required w/ FDT.

diffstat:

 sys/arch/arm/cortex/pl310.c |  15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diffs (37 lines):

diff -r 2e6c29efb053 -r e955269f27a2 sys/arch/arm/cortex/pl310.c
--- a/sys/arch/arm/cortex/pl310.c       Sat Jan 19 20:51:12 2019 +0000
+++ b/sys/arch/arm/cortex/pl310.c       Sat Jan 19 20:52:26 2019 +0000
@@ -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 @@
 
        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;