[src/trunk]: src/sys/arch/arm/broadcom Use PIC_IRQBASE_ALLOC and allow condit...

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

details:   https://anonhg.NetBSD.org/src/rev/7c22918c2fbd
branches:  trunk
changeset: 847516:7c22918c2fbd
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Dec 26 08:27:43 2019 +0000

description:
Use PIC_IRQBASE_ALLOC and allow conditional attachment of interrupt
handlers (for RPI4)

(missing from previous commit)

diffstat:

 sys/arch/arm/broadcom/bcm2835reg.h |  11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diffs (30 lines):

diff -r 65348b587dd9 -r 7c22918c2fbd sys/arch/arm/broadcom/bcm2835reg.h
--- a/sys/arch/arm/broadcom/bcm2835reg.h        Thu Dec 26 04:53:11 2019 +0000
+++ b/sys/arch/arm/broadcom/bcm2835reg.h        Thu Dec 26 08:27:43 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcm2835reg.h,v 1.26 2019/12/24 14:10:51 skrll Exp $    */
+/*     $NetBSD: bcm2835reg.h,v 1.27 2019/12/26 08:27:43 skrll Exp $    */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -139,18 +139,13 @@
 #define        BCM2835_INTC_ENABLEBASE         (BCM2835_INTC_BASE + 0x10)
 #define        BCM2835_INTC_DISABLEBASE        (BCM2835_INTC_BASE + 0x1c)
 
-#if defined(SOC_BCM2836)
-#define        BCM2835_INT_BASE                BCM2836_NIRQ
-#else
-#define        BCM2835_INT_BASE                0
-#endif /* !BCM2836 */
+#define BCM2835_INT_BASE               bcm2835_int_base
 
 #define        BCM2836_NCPUS                   4
 #define        BCM2836_NIRQPERCPU              32
 
-#define        BCM2836_INT_LOCALBASE           0
+#define        BCM2836_INT_LOCALBASE           bcm2836mp_int_base
 #define        BCM2836_INT_BASECPUN(n)         (BCM2836_INT_LOCALBASE + ((n) * BCM2836_NIRQPERCPU))
-#define        BCM2836_NIRQ                    (BCM2836_NIRQPERCPU * BCM2836_NCPUS)
 
 #define        BCM2836_INT_CNTPSIRQ            0
 #define        BCM2836_INT_CNTPNSIRQ           1