[src/trunk]: src/sys/arch/arm/omap Make the interrupt controller and PRCM cri...

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

details:   https://anonhg.NetBSD.org/src/rev/fbe594d2dd4a
branches:  trunk
changeset: 783220:fbe594d2dd4a
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Tue Dec 11 19:18:56 2012 +0000

description:
Make the interrupt controller and PRCM critical for the AM335x.

This adds some more crufty #ifdefs to a mess that needs to be
rototilled, but it'll do to make progress for now.

diffstat:

 sys/arch/arm/omap/omap2_obio.c |  18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diffs (55 lines):

diff -r 1ef7a8f7945a -r fbe594d2dd4a sys/arch/arm/omap/omap2_obio.c
--- a/sys/arch/arm/omap/omap2_obio.c    Tue Dec 11 19:06:23 2012 +0000
+++ b/sys/arch/arm/omap/omap2_obio.c    Tue Dec 11 19:18:56 2012 +0000
@@ -1,7 +1,7 @@
-/*     $Id: omap2_obio.c,v 1.16 2012/12/11 01:54:42 khorben Exp $      */
+/*     $Id: omap2_obio.c,v 1.17 2012/12/11 19:18:56 riastradh Exp $    */
 
 /* adapted from: */
-/*     $NetBSD: omap2_obio.c,v 1.16 2012/12/11 01:54:42 khorben Exp $ */
+/*     $NetBSD: omap2_obio.c,v 1.17 2012/12/11 19:18:56 riastradh Exp $ */
 
 
 /*
@@ -103,7 +103,7 @@
 
 #include "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_obio.c,v 1.16 2012/12/11 01:54:42 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_obio.c,v 1.17 2012/12/11 19:18:56 riastradh Exp $");
 
 #include "locators.h"
 #include "obio.h"
@@ -177,6 +177,11 @@
                return 1;
 #endif
 
+#ifdef TI_AM335X
+       if (obio_attached == 0)
+               return 1;
+#endif
+
        return 0;
 }
 
@@ -221,6 +226,9 @@
        else if (mb->mb_iobase == OMAP2_OBIO_3_BASE)
                obio_attached |= 8;
 #endif
+#ifdef TI_AM335X
+       obio_attached = 1;
+#endif
 
        /*
         * Attach critical devices first.
@@ -370,6 +378,10 @@
 #if 0
        { .name = "dmac", .addr = DMAC_BASE, .required = true },
 #endif
+#if defined(TI_AM335X)
+       { .name = "omapicu", .addr = 0x48200000, .required = true },
+       { .name = "prcm", .addr = 0x44e00000, .required = true },
+#endif
 };
 
 static void