diff options
author | imp <imp@FreeBSD.org> | 2014-08-14 04:21:31 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2014-08-14 04:21:31 +0000 |
commit | dc346017bfbaef5b299df9ab6b766bb11aa31044 (patch) | |
tree | e451a2e66b423325f0bf0d9a67d512808f0afe59 | |
parent | 84d638ac06bf55c91e96c3fd64f5389e3cd46dd3 (diff) | |
download | FreeBSD-src-dc346017bfbaef5b299df9ab6b766bb11aa31044.zip FreeBSD-src-dc346017bfbaef5b299df9ab6b766bb11aa31044.tar.gz |
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.
-rw-r--r-- | sys/arm/at91/at91.c | 2 | ||||
-rw-r--r-- | sys/arm/at91/at91sam9260.c | 1 | ||||
-rw-r--r-- | sys/arm/at91/at91sam9260reg.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/sys/arm/at91/at91.c b/sys/arm/at91/at91.c index 5caa326..56b32bd 100644 --- a/sys/arm/at91/at91.c +++ b/sys/arm/at91/at91.c @@ -255,7 +255,7 @@ at91_cpu_add_builtin_children(device_t dev, const struct cpu_devs *walker) { 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); diff --git a/sys/arm/at91/at91sam9260.c b/sys/arm/at91/at91sam9260.c index 03ad462..5b0f537 100644 --- a/sys/arm/at91/at91sam9260.c +++ b/sys/arm/at91/at91sam9260.c @@ -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), diff --git a/sys/arm/at91/at91sam9260reg.h b/sys/arm/at91/at91sam9260reg.h index 5320d8a..839b714 100644 --- a/sys/arm/at91/at91sam9260reg.h +++ b/sys/arm/at91/at91sam9260reg.h @@ -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 |