Date: Fri, 29 Jun 2012 06:05:44 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r237744 - head/sys/arm/at91 Message-ID: <201206290605.q5T65iSa022478@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Fri Jun 29 06:05:44 2012 New Revision: 237744 URL: http://svn.freebsd.org/changeset/base/237744 Log: Add PIOD, make at91sam9x25 a standard SoC, tweak some comments. Modified: head/sys/arm/at91/at91sam9x25.c head/sys/arm/at91/at91sam9x25reg.h head/sys/arm/at91/std.at91sam9 Modified: head/sys/arm/at91/at91sam9x25.c ============================================================================== --- head/sys/arm/at91/at91sam9x25.c Fri Jun 29 04:49:50 2012 (r237743) +++ head/sys/arm/at91/at91sam9x25.c Fri Jun 29 06:05:44 2012 (r237744) @@ -110,6 +110,7 @@ static const struct cpu_devs at91_devs[] DEVICE("at91_pio", PIOA, 0), DEVICE("at91_pio", PIOB, 1), DEVICE("at91_pio", PIOC, 2), + DEVICE("at91_pio", PIOD, 3), DEVICE("at91_twi", TWI0, 0), DEVICE("at91_twi", TWI1, 1), DEVICE("at91_twi", TWI2, 2), Modified: head/sys/arm/at91/at91sam9x25reg.h ============================================================================== --- head/sys/arm/at91/at91sam9x25reg.h Fri Jun 29 04:49:50 2012 (r237743) +++ head/sys/arm/at91/at91sam9x25reg.h Fri Jun 29 06:05:44 2012 (r237744) @@ -138,11 +138,12 @@ #define AT91SAM9X25_PIOB_SIZE 0x200 #define AT91SAM9X25_PIOC_BASE 0xffff800 #define AT91SAM9X25_PIOC_SIZE 0x200 +#define AT91SAM9X25_PIOD_BASE 0xffffa00 +#define AT91SAM9X25_PIOD_SIZE 0x200 #define AT91RM92_PMC_BASE 0xffffc00 #define AT91RM92_PMC_SIZE 0x100 -/* IRQs : */ -/*XXX FIXME XXX +/* IRQs : * 0: AIC * 1: System peripheral (System timer, RTC, DBGU) * 2: PIO Controller A,B @@ -168,13 +169,13 @@ * 22: UHPHS - USB Host controller * 23: UDPHS - USB Device Controller * 24: EMAC0 - * 25: Reserved + * 25: LCD controller or Image Sensor Interface * 26: HSMCI1 * 27: EMAC1 * 28: SSC * 29: CAN0 * 30: CAN1 - * 31: AIC IRQ + * 31: AIC IRQ0 */ #define AT91SAM9X25_IRQ_AIC 0 @@ -220,6 +221,7 @@ #define AT91SAM9X25_IRQ_PIOA AT91SAM9X25_IRQ_PIOAB #define AT91SAM9X25_IRQ_PIOB AT91SAM9X25_IRQ_PIOAB #define AT91SAM9X25_IRQ_PIOC AT91SAM9X25_IRQ_PIOCD +#define AT91SAM9X25_IRQ_PIOD AT91SAM9X25_IRQ_PIOCD #define AT91SAM9X25_IRQ_NAND (-1) #define AT91SAM9X25_AIC_BASE 0xffff000 Modified: head/sys/arm/at91/std.at91sam9 ============================================================================== --- head/sys/arm/at91/std.at91sam9 Fri Jun 29 04:49:50 2012 (r237743) +++ head/sys/arm/at91/std.at91sam9 Fri Jun 29 06:05:44 2012 (r237744) @@ -10,3 +10,4 @@ device at91sam9 device at91sam9260 device at91sam9g20 +device at91sam9x25
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206290605.q5T65iSa022478>