Date: Tue, 10 Jul 2012 02:39:04 +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: r238331 - head/sys/arm/at91 Message-ID: <201207100239.q6A2d4ee054709@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Jul 10 02:39:03 2012 New Revision: 238331 URL: http://svn.freebsd.org/changeset/base/238331 Log: The system IRQ is always IRQ 1. Make it so. Modified: head/sys/arm/at91/at91reg.h head/sys/arm/at91/at91rm9200.c head/sys/arm/at91/at91sam9260.c head/sys/arm/at91/at91sam9g20.c head/sys/arm/at91/at91sam9x25.c Modified: head/sys/arm/at91/at91reg.h ============================================================================== --- head/sys/arm/at91/at91reg.h Tue Jul 10 02:14:50 2012 (r238330) +++ head/sys/arm/at91/at91reg.h Tue Jul 10 02:39:03 2012 (r238331) @@ -85,4 +85,6 @@ #define AT91_EXID_SAM9G25 0x00000003 #define AT91_EXID_SAM9X25 0x00000004 +#define AT91_IRQ_SYSTEM 1 + #endif /* _AT91REG_H_ */ Modified: head/sys/arm/at91/at91rm9200.c ============================================================================== --- head/sys/arm/at91/at91rm9200.c Tue Jul 10 02:14:50 2012 (r238330) +++ head/sys/arm/at91/at91rm9200.c Tue Jul 10 02:39:03 2012 (r238331) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <arm/at91/at91var.h> +#include <arm/at91/at91reg.h> #include <arm/at91/at91rm92reg.h> #include <arm/at91/at91_aicreg.h> #include <arm/at91/at91_pmcreg.h> @@ -157,7 +158,7 @@ at91_add_child(device_t dev, int prio, c resource_list_init(&ivar->resources); if (irq0 != -1) { bus_set_resource(kid, SYS_RES_IRQ, 0, irq0, 1); - if (irq0 != AT91RM92_IRQ_SYSTEM) + if (irq0 != AT91_IRQ_SYSTEM) at91_pmc_clock_add(device_get_nameunit(kid), irq0, 0); } if (irq1 != 0) @@ -238,7 +239,7 @@ at91_attach(device_t dev) /* XXX Hack to tell atmelarm about the AIC */ at91sc->sc_aic_sh = sc->sc_aic_sh; - at91sc->sc_irq_system = AT91RM92_IRQ_SYSTEM; + at91sc->sc_irq_system = AT91_IRQ_SYSTEM; for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR + Modified: head/sys/arm/at91/at91sam9260.c ============================================================================== --- head/sys/arm/at91/at91sam9260.c Tue Jul 10 02:14:50 2012 (r238330) +++ head/sys/arm/at91/at91sam9260.c Tue Jul 10 02:39:03 2012 (r238331) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <arm/at91/at91var.h> +#include <arm/at91/at91reg.h> #include <arm/at91/at91_aicreg.h> #include <arm/at91/at91sam9260reg.h> #include <arm/at91/at91_pmcreg.h> @@ -150,7 +151,7 @@ at91_add_child(device_t dev, int prio, c resource_list_init(&ivar->resources); if (irq0 != -1) { bus_set_resource(kid, SYS_RES_IRQ, 0, irq0, 1); - if (irq0 != AT91SAM9260_IRQ_SYSTEM) + if (irq0 != AT91_IRQ_SYSTEM) at91_pmc_clock_add(device_get_nameunit(kid), irq0, 0); } if (irq1 != 0) @@ -238,7 +239,7 @@ at91_attach(device_t dev) /* XXX Hack to tell atmelarm about the AIC */ at91sc->sc_aic_sh = sc->sc_aic_sh; - at91sc->sc_irq_system = AT91SAM9260_IRQ_SYSTEM; + at91sc->sc_irq_system = AT91_IRQ_SYSTEM; for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR + Modified: head/sys/arm/at91/at91sam9g20.c ============================================================================== --- head/sys/arm/at91/at91sam9g20.c Tue Jul 10 02:14:50 2012 (r238330) +++ head/sys/arm/at91/at91sam9g20.c Tue Jul 10 02:39:03 2012 (r238331) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <arm/at91/at91var.h> +#include <arm/at91/at91reg.h> #include <arm/at91/at91_aicreg.h> #include <arm/at91/at91sam9g20reg.h> #include <arm/at91/at91_pmcreg.h> @@ -150,7 +151,7 @@ at91_add_child(device_t dev, int prio, c resource_list_init(&ivar->resources); if (irq0 != -1) { bus_set_resource(kid, SYS_RES_IRQ, 0, irq0, 1); - if (irq0 != AT91SAM9G20_IRQ_SYSTEM) + if (irq0 != AT91_IRQ_SYSTEM) at91_pmc_clock_add(device_get_nameunit(kid), irq0, 0); } if (irq1 != 0) @@ -249,7 +250,7 @@ at91_attach(device_t dev) /* XXX Hack to tell atmelarm about the AIC */ at91sc->sc_aic_sh = sc->sc_aic_sh; - at91sc->sc_irq_system = AT91SAM9G20_IRQ_SYSTEM; + at91sc->sc_irq_system = AT91_IRQ_SYSTEM; for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR + Modified: head/sys/arm/at91/at91sam9x25.c ============================================================================== --- head/sys/arm/at91/at91sam9x25.c Tue Jul 10 02:14:50 2012 (r238330) +++ head/sys/arm/at91/at91sam9x25.c Tue Jul 10 02:39:03 2012 (r238331) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <arm/at91/at91var.h> +#include <arm/at91/at91reg.h> #include <arm/at91/at91_aicreg.h> #include <arm/at91/at91sam9x25reg.h> #include <arm/at91/at91_pmcreg.h> @@ -153,7 +154,7 @@ at91_add_child(device_t dev, int prio, c resource_list_init(&ivar->resources); if (irq0 != -1) { bus_set_resource(kid, SYS_RES_IRQ, 0, irq0, 1); - if (irq0 != AT91SAM9X25_IRQ_SYSTEM) + if (irq0 != AT91_IRQ_SYSTEM) at91_pmc_clock_add(device_get_nameunit(kid), irq0, 0); } if (irq1 != 0) @@ -252,7 +253,7 @@ at91_attach(device_t dev) /* XXX Hack to tell atmelarm about the AIC */ at91sc->sc_aic_sh = sc->sc_aic_sh; - at91sc->sc_irq_system = AT91SAM9X25_IRQ_SYSTEM; + at91sc->sc_irq_system = AT91_IRQ_SYSTEM; for (i = 0; i < 32; i++) { bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207100239.q6A2d4ee054709>