[src/trunk]: src/sys/arch/arm/omap am335x's main interrupt source is 128.

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

details:   https://anonhg.NetBSD.org/src/rev/0a9ad5b735cb
branches:  trunk
changeset: 348108:0a9ad5b735cb
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Tue Oct 04 15:38:31 2016 +0000

description:
am335x's main interrupt source is 128.

diffstat:

 sys/arch/arm/omap/omap2_icu.c |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r c8d9cb40c182 -r 0a9ad5b735cb sys/arch/arm/omap/omap2_icu.c
--- a/sys/arch/arm/omap/omap2_icu.c     Tue Oct 04 15:32:02 2016 +0000
+++ b/sys/arch/arm/omap/omap2_icu.c     Tue Oct 04 15:38:31 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap2_icu.c,v 1.9 2012/08/20 12:38:28 matt Exp $       */
+/*     $NetBSD: omap2_icu.c,v 1.10 2016/10/04 15:38:31 kiyohara Exp $  */
 /*
  * Define the SDP2430 specific information and then include the generic OMAP
  * interrupt header.
@@ -30,7 +30,7 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.9 2012/08/20 12:38:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.10 2016/10/04 15:38:31 kiyohara Exp $");
 
 #include <sys/param.h>
 #include <sys/evcnt.h>
@@ -82,11 +82,19 @@
        bus_space_tag_t sc_memt;
        bus_space_handle_t sc_memh;
        struct pic_softc sc_pic;
+#if defined(TI_AM335X)
+       uint32_t sc_enabled_irqs[4];
+#else
        uint32_t sc_enabled_irqs[3];
+#endif
 } omap2icu_softc = {
        .sc_pic = {
                .pic_ops = &omap2icu_picops,
+#if defined(TI_AM335X)
+               .pic_maxsources = 128,
+#else
                .pic_maxsources = 96,
+#endif
                .pic_name = "omap2icu",
        },
 };
@@ -161,7 +169,7 @@
 void
 omap2icu_establish_irq(struct pic_softc *pic, struct intrsource *is)
 {
-       KASSERT(is->is_irq < 96);
+       KASSERT(is->is_irq < omap2icu_softc.sc_pic.pic_maxsources);
        KASSERT(is->is_type == IST_LEVEL);
 }