svn commit: r269960 - head/sys/arm/at91

[Warner Losh]

Author: imp
Date: Thu Aug 14 04:21:31 2014
New Revision: 269960
URL: http://svnweb.freebsd.org/changeset/base/269960

Log:
  Add AIC to at91sam9260 support, now that it is needed for multipass to
  work. This gets my AT91SAM9260-based boards almost booting with
  current in multi pass. The MCI driver is broken, but it is equally
  broken before multi-pass.

Modified:
  head/sys/arm/at91/at91.c
  head/sys/arm/at91/at91sam9260.c
  head/sys/arm/at91/at91sam9260reg.h

Modified: head/sys/arm/at91/at91.c
==============================================================================
--- head/sys/arm/at91/at91.c	Thu Aug 14 04:21:25 2014	(r269959)
+++ head/sys/arm/at91/at91.c	Thu Aug 14 04:21:31 2014	(r269960)
@@ -255,7 +255,7 @@ at91_cpu_add_builtin_children(device_t d
 {
 	int i;
 
-	for (i = 1; walker->name; i++, walker++) {
+	for (i = 0; walker->name; i++, walker++) {
 		at91_add_child(dev, i, walker->name, walker->unit,
 		    walker->mem_base, walker->mem_len, walker->irq0,
 		    walker->irq1, walker->irq2);

Modified: head/sys/arm/at91/at91sam9260.c
==============================================================================
--- head/sys/arm/at91/at91sam9260.c	Thu Aug 14 04:21:25 2014	(r269959)
+++ head/sys/arm/at91/at91sam9260.c	Thu Aug 14 04:21:31 2014	(r269960)
@@ -103,6 +103,7 @@ static const uint32_t at91_pio_base[] = 
 
 static const struct cpu_devs at91_devs[] =
 {
+	DEVICE("at91_aic", AIC,  0),
 	DEVICE("at91_pmc", PMC,  0),
 	DEVICE("at91_wdt", WDT,  0),
 	DEVICE("at91_rst", RSTC, 0),

Modified: head/sys/arm/at91/at91sam9260reg.h
==============================================================================
--- head/sys/arm/at91/at91sam9260reg.h	Thu Aug 14 04:21:25 2014	(r269959)
+++ head/sys/arm/at91/at91sam9260reg.h	Thu Aug 14 04:21:31 2014	(r269960)
@@ -220,6 +220,7 @@
 #define AT91SAM9260_IRQ_RSTC 	AT91SAM9260_IRQ_SYSTEM
 #define AT91SAM9260_IRQ_OHCI 	AT91SAM9260_IRQ_UHP
 #define AT91SAM9260_IRQ_NAND 	(-1)
+#define AT91SAM9260_IRQ_AIC	(-1)
 
 #define AT91SAM9260_AIC_BASE	0xffff000
 #define AT91SAM9260_AIC_SIZE	0x200