* [RESEND PATCH 0/3] ARM: at91: move aic driver to drivers/irqchip
@ 2013-05-23 9:05 Boris BREZILLON
2013-05-23 9:05 ` [PATCH 1/3] ARM: at91: move at91 " Boris BREZILLON
` (2 more replies)
0 siblings, 3 replies; 20+ messages in thread
From: Boris BREZILLON @ 2013-05-23 9:05 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
Sorry for the resend. This version is made using git format-patch -M.
This patch series move the at91 AIC (Advance Interrupt Controller)
driver to the irqchip subsystem directory (drivers/irqchip).
It also make use of IRQCHIP_DECLARE to register irqchip for dt boards
instead of using the machine specific "init_irq" function.
Finally it register the arch specific irq handler inside the the init
functions using set_handle_irq. This way we can remove all the machine
specific "handle_irq".
This patch series was tested on kizbox board (sam9g20 SoC) using
device tree. Could someone test it on other boards (both dt and non dt)?
Best Regards,
Boris
Boris BREZILLON (3):
ARM: at91: move at91 aic driver to drivers/irqchip
ARM: at91: use IRQCHIP_DECLARE instead of machine specific init_irq
ARM: at91: use set_handle_irq instead of machine specific handle_irq
arch/arm/mach-at91/Makefile | 2 +-
arch/arm/mach-at91/at91rm9200.c | 2 +-
arch/arm/mach-at91/at91sam9260.c | 2 +-
arch/arm/mach-at91/at91sam9261.c | 2 +-
arch/arm/mach-at91/at91sam9263.c | 2 +-
arch/arm/mach-at91/at91sam9g45.c | 2 +-
arch/arm/mach-at91/at91sam9rl.c | 2 +-
arch/arm/mach-at91/at91x40.c | 2 +-
arch/arm/mach-at91/board-1arm.c | 3 +--
arch/arm/mach-at91/board-afeb-9260v1.c | 3 +--
arch/arm/mach-at91/board-cam60.c | 3 +--
arch/arm/mach-at91/board-carmeva.c | 3 +--
arch/arm/mach-at91/board-cpu9krea.c | 3 +--
arch/arm/mach-at91/board-cpuat91.c | 3 +--
arch/arm/mach-at91/board-csb337.c | 3 +--
arch/arm/mach-at91/board-csb637.c | 3 +--
arch/arm/mach-at91/board-dt-rm9200.c | 15 ++-------------
arch/arm/mach-at91/board-dt-sam9.c | 16 ++--------------
arch/arm/mach-at91/board-dt-sama5.c | 16 ++--------------
arch/arm/mach-at91/board-eb01.c | 4 ++--
arch/arm/mach-at91/board-eb9200.c | 4 ++--
arch/arm/mach-at91/board-ecbat91.c | 3 +--
arch/arm/mach-at91/board-eco920.c | 3 +--
arch/arm/mach-at91/board-flexibity.c | 3 +--
arch/arm/mach-at91/board-foxg20.c | 3 +--
arch/arm/mach-at91/board-gsia18s.c | 3 +--
arch/arm/mach-at91/board-kafa.c | 3 +--
arch/arm/mach-at91/board-kb9202.c | 3 +--
arch/arm/mach-at91/board-pcontrol-g20.c | 3 +--
arch/arm/mach-at91/board-picotux200.c | 3 +--
arch/arm/mach-at91/board-qil-a9260.c | 3 +--
arch/arm/mach-at91/board-rm9200dk.c | 3 +--
arch/arm/mach-at91/board-rm9200ek.c | 3 +--
arch/arm/mach-at91/board-rsi-ews.c | 4 ++--
arch/arm/mach-at91/board-sam9-l9260.c | 3 +--
arch/arm/mach-at91/board-sam9260ek.c | 3 +--
arch/arm/mach-at91/board-sam9261ek.c | 3 +--
arch/arm/mach-at91/board-sam9263ek.c | 3 +--
arch/arm/mach-at91/board-sam9g20ek.c | 4 +---
arch/arm/mach-at91/board-sam9m10g45ek.c | 3 +--
arch/arm/mach-at91/board-sam9rlek.c | 3 +--
arch/arm/mach-at91/board-snapper9260.c | 3 +--
arch/arm/mach-at91/board-stamp9g20.c | 4 +---
arch/arm/mach-at91/board-usb-a926x.c | 5 +----
arch/arm/mach-at91/board-yl-9200.c | 3 +--
arch/arm/mach-at91/generic.h | 5 -----
arch/arm/mach-at91/{ => include/mach}/at91_aic.h | 3 ---
arch/arm/mach-at91/pm.c | 2 +-
drivers/irqchip/Makefile | 1 +
.../mach-at91/irq.c => drivers/irqchip/irq-at91.c | 12 +++++++++++-
50 files changed, 64 insertions(+), 131 deletions(-)
rename arch/arm/mach-at91/{ => include/mach}/at91_aic.h (97%)
rename arch/arm/mach-at91/irq.c => drivers/irqchip/irq-at91.c (97%)
--
1.7.9.5
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 9:05 [RESEND PATCH 0/3] ARM: at91: move aic driver to drivers/irqchip Boris BREZILLON @ 2013-05-23 9:05 ` Boris BREZILLON 2013-05-23 9:06 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-23 10:18 ` Russell King - ARM Linux 2013-05-23 9:05 ` [PATCH 2/3] ARM: at91: use IRQCHIP_DECLARE instead of machine specific init_irq Boris BREZILLON 2013-05-23 9:05 ` [PATCH 3/3] ARM: at91: use set_handle_irq instead of machine specific handle_irq Boris BREZILLON 2 siblings, 2 replies; 20+ messages in thread From: Boris BREZILLON @ 2013-05-23 9:05 UTC (permalink / raw) To: linux-arm-kernel Move arch/arm/mach-at91/irq.c to drivers/irqchip/irq-at91.c. Move arch/arm/mach-at91/at91_aic.h to arch/arm/mach-at91/include/mach/at91_aic.h to avoid ugly reference to header file : #include "../../arch/arm/mach-at91/at91_aic.h" Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> --- arch/arm/mach-at91/Makefile | 2 +- arch/arm/mach-at91/at91rm9200.c | 2 +- arch/arm/mach-at91/at91sam9260.c | 2 +- arch/arm/mach-at91/at91sam9261.c | 2 +- arch/arm/mach-at91/at91sam9263.c | 2 +- arch/arm/mach-at91/at91sam9g45.c | 2 +- arch/arm/mach-at91/at91sam9rl.c | 2 +- arch/arm/mach-at91/at91x40.c | 2 +- arch/arm/mach-at91/board-1arm.c | 2 +- arch/arm/mach-at91/board-afeb-9260v1.c | 2 +- arch/arm/mach-at91/board-cam60.c | 2 +- arch/arm/mach-at91/board-carmeva.c | 2 +- arch/arm/mach-at91/board-cpu9krea.c | 2 +- arch/arm/mach-at91/board-cpuat91.c | 2 +- arch/arm/mach-at91/board-csb337.c | 2 +- arch/arm/mach-at91/board-csb637.c | 2 +- arch/arm/mach-at91/board-dt-rm9200.c | 3 ++- arch/arm/mach-at91/board-dt-sam9.c | 3 ++- arch/arm/mach-at91/board-dt-sama5.c | 3 ++- arch/arm/mach-at91/board-eb01.c | 3 ++- arch/arm/mach-at91/board-eb9200.c | 3 ++- arch/arm/mach-at91/board-ecbat91.c | 2 +- arch/arm/mach-at91/board-eco920.c | 2 +- arch/arm/mach-at91/board-flexibity.c | 2 +- arch/arm/mach-at91/board-foxg20.c | 2 +- arch/arm/mach-at91/board-gsia18s.c | 2 +- arch/arm/mach-at91/board-kafa.c | 2 +- arch/arm/mach-at91/board-kb9202.c | 2 +- arch/arm/mach-at91/board-pcontrol-g20.c | 2 +- arch/arm/mach-at91/board-picotux200.c | 2 +- arch/arm/mach-at91/board-qil-a9260.c | 2 +- arch/arm/mach-at91/board-rm9200dk.c | 2 +- arch/arm/mach-at91/board-rm9200ek.c | 2 +- arch/arm/mach-at91/board-rsi-ews.c | 3 ++- arch/arm/mach-at91/board-sam9-l9260.c | 2 +- arch/arm/mach-at91/board-sam9260ek.c | 2 +- arch/arm/mach-at91/board-sam9261ek.c | 2 +- arch/arm/mach-at91/board-sam9263ek.c | 2 +- arch/arm/mach-at91/board-sam9g20ek.c | 2 +- arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +- arch/arm/mach-at91/board-sam9rlek.c | 2 +- arch/arm/mach-at91/board-snapper9260.c | 2 +- arch/arm/mach-at91/board-stamp9g20.c | 2 +- arch/arm/mach-at91/board-usb-a926x.c | 2 +- arch/arm/mach-at91/board-yl-9200.c | 2 +- arch/arm/mach-at91/{ => include/mach}/at91_aic.h | 0 arch/arm/mach-at91/pm.c | 2 +- drivers/irqchip/Makefile | 1 + .../mach-at91/irq.c => drivers/irqchip/irq-at91.c | 2 +- 49 files changed, 54 insertions(+), 47 deletions(-) diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 788562d..5333701 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -2,7 +2,7 @@ # Makefile for the linux kernel. # -obj-y := irq.o gpio.o setup.o +obj-y := gpio.o setup.o obj-m := obj-n := obj- := diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index d193a40..6c1204a 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -20,8 +20,8 @@ #include <mach/at91_pmc.h> #include <mach/at91_st.h> #include <mach/cpu.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "soc.h" #include "generic.h" #include "clock.h" diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index a8ce245..55332fa 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c @@ -21,8 +21,8 @@ #include <mach/at91_dbgu.h> #include <mach/at91sam9260.h> #include <mach/at91_pmc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_rstc.h" #include "soc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index 25efb5a..6db61e6 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c @@ -20,8 +20,8 @@ #include <mach/cpu.h> #include <mach/at91sam9261.h> #include <mach/at91_pmc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_rstc.h" #include "soc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index f44ffd2..b9ec043 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c @@ -19,8 +19,8 @@ #include <asm/system_misc.h> #include <mach/at91sam9263.h> #include <mach/at91_pmc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_rstc.h" #include "soc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index 8b7fce0..1270707 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c @@ -20,8 +20,8 @@ #include <mach/at91sam9g45.h> #include <mach/at91_pmc.h> #include <mach/cpu.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "soc.h" #include "generic.h" #include "clock.h" diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c index f77fae5..d5f77d6 100644 --- a/arch/arm/mach-at91/at91sam9rl.c +++ b/arch/arm/mach-at91/at91sam9rl.c @@ -20,8 +20,8 @@ #include <mach/at91_dbgu.h> #include <mach/at91sam9rl.h> #include <mach/at91_pmc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_rstc.h" #include "soc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/at91x40.c b/arch/arm/mach-at91/at91x40.c index 19ca793..e8b30fb 100644 --- a/arch/arm/mach-at91/at91x40.c +++ b/arch/arm/mach-at91/at91x40.c @@ -20,8 +20,8 @@ #include <mach/at91x40.h> #include <mach/at91_st.h> #include <mach/timex.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "generic.h" /* diff --git a/arch/arm/mach-at91/board-1arm.c b/arch/arm/mach-at91/board-1arm.c index 35ab632..8037dfe 100644 --- a/arch/arm/mach-at91/board-1arm.c +++ b/arch/arm/mach-at91/board-1arm.c @@ -34,9 +34,9 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> +#include <mach/at91_aic.h> #include <mach/cpu.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c index f95e31c..28bea23 100644 --- a/arch/arm/mach-at91/board-afeb-9260v1.c +++ b/arch/arm/mach-at91/board-afeb-9260v1.c @@ -42,8 +42,8 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/mach/irq.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c index ade948b..6ebdf32 100644 --- a/arch/arm/mach-at91/board-cam60.c +++ b/arch/arm/mach-at91/board-cam60.c @@ -39,8 +39,8 @@ #include <asm/mach/irq.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c index 9298305..842db49 100644 --- a/arch/arm/mach-at91/board-carmeva.c +++ b/arch/arm/mach-at91/board-carmeva.c @@ -35,8 +35,8 @@ #include <asm/mach/irq.h> #include <mach/hardware.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c index 008527e..4714e9e 100644 --- a/arch/arm/mach-at91/board-cpu9krea.c +++ b/arch/arm/mach-at91/board-cpu9krea.c @@ -43,8 +43,8 @@ #include <mach/at91sam9_smc.h> #include <mach/at91sam9260_matrix.h> #include <mach/at91_matrix.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c index 42f1353..c1663ed 100644 --- a/arch/arm/mach-at91/board-cpuat91.c +++ b/arch/arm/mach-at91/board-cpuat91.c @@ -39,8 +39,8 @@ #include <mach/at91rm9200_mc.h> #include <mach/at91_ramc.h> #include <mach/cpu.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c index e5fde215..3231703 100644 --- a/arch/arm/mach-at91/board-csb337.c +++ b/arch/arm/mach-at91/board-csb337.c @@ -38,8 +38,8 @@ #include <asm/mach/irq.h> #include <mach/hardware.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c index fdf1106..d58c7e6 100644 --- a/arch/arm/mach-at91/board-csb637.c +++ b/arch/arm/mach-at91/board-csb637.c @@ -35,8 +35,8 @@ #include <asm/mach/irq.h> #include <mach/hardware.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c index 3fcb662..0c2a06d 100644 --- a/arch/arm/mach-at91/board-dt-rm9200.c +++ b/arch/arm/mach-at91/board-dt-rm9200.c @@ -22,7 +22,8 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include "at91_aic.h" +#include <mach/at91_aic.h> + #include "generic.h" diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/board-dt-sam9.c index 8db3013..ac899d8 100644 --- a/arch/arm/mach-at91/board-dt-sam9.c +++ b/arch/arm/mach-at91/board-dt-sam9.c @@ -21,7 +21,8 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include "at91_aic.h" +#include <mach/at91_aic.h> + #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c index 705305e..43b8f7a 100644 --- a/arch/arm/mach-at91/board-dt-sama5.c +++ b/arch/arm/mach-at91/board-dt-sama5.c @@ -23,7 +23,8 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include "at91_aic.h" +#include <mach/at91_aic.h> + #include "generic.h" diff --git a/arch/arm/mach-at91/board-eb01.c b/arch/arm/mach-at91/board-eb01.c index becf0a6..4097ede 100644 --- a/arch/arm/mach-at91/board-eb01.c +++ b/arch/arm/mach-at91/board-eb01.c @@ -28,7 +28,8 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include "at91_aic.h" +#include <mach/at91_aic.h> + #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-eb9200.c b/arch/arm/mach-at91/board-eb9200.c index f9be816..afa5ebb 100644 --- a/arch/arm/mach-at91/board-eb9200.c +++ b/arch/arm/mach-at91/board-eb9200.c @@ -35,7 +35,8 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include "at91_aic.h" +#include <mach/at91_aic.h> + #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c index b2fcd71..c794768 100644 --- a/arch/arm/mach-at91/board-ecbat91.c +++ b/arch/arm/mach-at91/board-ecbat91.c @@ -38,8 +38,8 @@ #include <asm/mach/irq.h> #include <mach/cpu.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-eco920.c b/arch/arm/mach-at91/board-eco920.c index 77de410..fc3e373 100644 --- a/arch/arm/mach-at91/board-eco920.c +++ b/arch/arm/mach-at91/board-eco920.c @@ -27,8 +27,8 @@ #include <mach/at91rm9200_mc.h> #include <mach/at91_ramc.h> #include <mach/cpu.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c index 737c085..59a1958 100644 --- a/arch/arm/mach-at91/board-flexibity.c +++ b/arch/arm/mach-at91/board-flexibity.c @@ -33,8 +33,8 @@ #include <asm/mach/irq.h> #include <mach/hardware.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-foxg20.c b/arch/arm/mach-at91/board-foxg20.c index c20a870..4b4df05 100644 --- a/arch/arm/mach-at91/board-foxg20.c +++ b/arch/arm/mach-at91/board-foxg20.c @@ -42,8 +42,8 @@ #include <asm/mach/irq.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-gsia18s.c b/arch/arm/mach-at91/board-gsia18s.c index c1d61d2..1babcbd 100644 --- a/arch/arm/mach-at91/board-gsia18s.c +++ b/arch/arm/mach-at91/board-gsia18s.c @@ -31,8 +31,8 @@ #include <asm/mach/arch.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c index 88e2f5d..aca52d3 100644 --- a/arch/arm/mach-at91/board-kafa.c +++ b/arch/arm/mach-at91/board-kafa.c @@ -35,8 +35,8 @@ #include <asm/mach/irq.h> #include <mach/cpu.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c index 0c519d9..7768df0 100644 --- a/arch/arm/mach-at91/board-kb9202.c +++ b/arch/arm/mach-at91/board-kb9202.c @@ -38,8 +38,8 @@ #include <mach/cpu.h> #include <mach/at91rm9200_mc.h> #include <mach/at91_ramc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-pcontrol-g20.c b/arch/arm/mach-at91/board-pcontrol-g20.c index 65c0d6b..6df21db 100644 --- a/arch/arm/mach-at91/board-pcontrol-g20.c +++ b/arch/arm/mach-at91/board-pcontrol-g20.c @@ -30,8 +30,8 @@ #include <asm/mach/arch.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c index ab2b2ec..566b30c 100644 --- a/arch/arm/mach-at91/board-picotux200.c +++ b/arch/arm/mach-at91/board-picotux200.c @@ -39,8 +39,8 @@ #include <mach/at91rm9200_mc.h> #include <mach/at91_ramc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c index aa3bc9b..0ae5eb1 100644 --- a/arch/arm/mach-at91/board-qil-a9260.c +++ b/arch/arm/mach-at91/board-qil-a9260.c @@ -41,8 +41,8 @@ #include <mach/hardware.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c index 690541b..82f0335e 100644 --- a/arch/arm/mach-at91/board-rm9200dk.c +++ b/arch/arm/mach-at91/board-rm9200dk.c @@ -41,8 +41,8 @@ #include <mach/hardware.h> #include <mach/at91rm9200_mc.h> #include <mach/at91_ramc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-rm9200ek.c b/arch/arm/mach-at91/board-rm9200ek.c index 8b17dad..5e8a4f7 100644 --- a/arch/arm/mach-at91/board-rm9200ek.c +++ b/arch/arm/mach-at91/board-rm9200ek.c @@ -41,8 +41,8 @@ #include <mach/hardware.h> #include <mach/at91rm9200_mc.h> #include <mach/at91_ramc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-rsi-ews.c b/arch/arm/mach-at91/board-rsi-ews.c index f6d7f19..e7d0a69 100644 --- a/arch/arm/mach-at91/board-rsi-ews.c +++ b/arch/arm/mach-at91/board-rsi-ews.c @@ -28,7 +28,8 @@ #include <linux/gpio.h> -#include "at91_aic.h" +#include <mach/at91_aic.h> + #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c index 43ee4dc..2e400cd 100644 --- a/arch/arm/mach-at91/board-sam9-l9260.c +++ b/arch/arm/mach-at91/board-sam9-l9260.c @@ -38,8 +38,8 @@ #include <asm/mach/irq.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c index 0b153c8..66ee7ac 100644 --- a/arch/arm/mach-at91/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c @@ -43,8 +43,8 @@ #include <mach/hardware.h> #include <mach/at91sam9_smc.h> #include <mach/system_rev.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c index b446645..515957e 100644 --- a/arch/arm/mach-at91/board-sam9261ek.c +++ b/arch/arm/mach-at91/board-sam9261ek.c @@ -47,8 +47,8 @@ #include <mach/hardware.h> #include <mach/at91sam9_smc.h> #include <mach/system_rev.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c index 3284df0..1099272 100644 --- a/arch/arm/mach-at91/board-sam9263ek.c +++ b/arch/arm/mach-at91/board-sam9263ek.c @@ -46,8 +46,8 @@ #include <mach/hardware.h> #include <mach/at91sam9_smc.h> #include <mach/system_rev.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index f9cd1f2..9fe718b 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c @@ -45,8 +45,8 @@ #include <mach/at91sam9_smc.h> #include <mach/system_rev.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c index 2a94896..1846647 100644 --- a/arch/arm/mach-at91/board-sam9m10g45ek.c +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c @@ -44,8 +44,8 @@ #include <mach/at91sam9_smc.h> #include <mach/system_rev.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c index aa265dc..623f2d1 100644 --- a/arch/arm/mach-at91/board-sam9rlek.c +++ b/arch/arm/mach-at91/board-sam9rlek.c @@ -31,9 +31,9 @@ #include <mach/hardware.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c index 3aaa978..8fef38a 100644 --- a/arch/arm/mach-at91/board-snapper9260.c +++ b/arch/arm/mach-at91/board-snapper9260.c @@ -33,8 +33,8 @@ #include <mach/hardware.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c index 869cbec..6bda942 100644 --- a/arch/arm/mach-at91/board-stamp9g20.c +++ b/arch/arm/mach-at91/board-stamp9g20.c @@ -26,8 +26,8 @@ #include <asm/mach/arch.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c index 2487d94..cedbc66 100644 --- a/arch/arm/mach-at91/board-usb-a926x.c +++ b/arch/arm/mach-at91/board-usb-a926x.c @@ -42,8 +42,8 @@ #include <mach/hardware.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c index be08377..c61d8c9 100644 --- a/arch/arm/mach-at91/board-yl-9200.c +++ b/arch/arm/mach-at91/board-yl-9200.c @@ -46,8 +46,8 @@ #include <mach/at91rm9200_mc.h> #include <mach/at91_ramc.h> #include <mach/cpu.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/at91_aic.h b/arch/arm/mach-at91/include/mach/at91_aic.h similarity index 100% rename from arch/arm/mach-at91/at91_aic.h rename to arch/arm/mach-at91/include/mach/at91_aic.h diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 530db30..d2a24e8 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -26,9 +26,9 @@ #include <asm/mach/irq.h> #include <mach/at91_pmc.h> +#include <mach/at91_aic.h> #include <mach/cpu.h> -#include "at91_aic.h" #include "generic.h" #include "pm.h" diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index cda4cb5..208b708 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_IRQCHIP) += irqchip.o +obj-$(CONFIG_ARCH_AT91) += irq-at91.o obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.o obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o diff --git a/arch/arm/mach-at91/irq.c b/drivers/irqchip/irq-at91.c similarity index 99% rename from arch/arm/mach-at91/irq.c rename to drivers/irqchip/irq-at91.c index e0ca591..daf2959 100644 --- a/arch/arm/mach-at91/irq.c +++ b/drivers/irqchip/irq-at91.c @@ -42,7 +42,7 @@ #include <asm/mach/irq.h> #include <asm/mach/map.h> -#include "at91_aic.h" +#include <mach/at91_aic.h> void __iomem *at91_aic_base; static struct irq_domain *at91_aic_domain; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 9:05 ` [PATCH 1/3] ARM: at91: move at91 " Boris BREZILLON @ 2013-05-23 9:06 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-23 9:51 ` boris brezillon 2013-05-23 10:18 ` Russell King - ARM Linux 1 sibling, 1 reply; 20+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-23 9:06 UTC (permalink / raw) To: linux-arm-kernel On 11:05 Thu 23 May , Boris BREZILLON wrote: > Move arch/arm/mach-at91/irq.c to drivers/irqchip/irq-at91.c. > Move arch/arm/mach-at91/at91_aic.h to > arch/arm/mach-at91/include/mach/at91_aic.h to avoid ugly reference > to header file : > #include "../../arch/arm/mach-at91/at91_aic.h" no we are going to drop arch/arm/mach-at91/include/mach for multi support arch/arm/mach-at91/include/mach is for removal Best Regards, J. > > Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> > --- > arch/arm/mach-at91/Makefile | 2 +- > arch/arm/mach-at91/at91rm9200.c | 2 +- > arch/arm/mach-at91/at91sam9260.c | 2 +- > arch/arm/mach-at91/at91sam9261.c | 2 +- > arch/arm/mach-at91/at91sam9263.c | 2 +- > arch/arm/mach-at91/at91sam9g45.c | 2 +- > arch/arm/mach-at91/at91sam9rl.c | 2 +- > arch/arm/mach-at91/at91x40.c | 2 +- > arch/arm/mach-at91/board-1arm.c | 2 +- > arch/arm/mach-at91/board-afeb-9260v1.c | 2 +- > arch/arm/mach-at91/board-cam60.c | 2 +- > arch/arm/mach-at91/board-carmeva.c | 2 +- > arch/arm/mach-at91/board-cpu9krea.c | 2 +- > arch/arm/mach-at91/board-cpuat91.c | 2 +- > arch/arm/mach-at91/board-csb337.c | 2 +- > arch/arm/mach-at91/board-csb637.c | 2 +- > arch/arm/mach-at91/board-dt-rm9200.c | 3 ++- > arch/arm/mach-at91/board-dt-sam9.c | 3 ++- > arch/arm/mach-at91/board-dt-sama5.c | 3 ++- > arch/arm/mach-at91/board-eb01.c | 3 ++- > arch/arm/mach-at91/board-eb9200.c | 3 ++- > arch/arm/mach-at91/board-ecbat91.c | 2 +- > arch/arm/mach-at91/board-eco920.c | 2 +- > arch/arm/mach-at91/board-flexibity.c | 2 +- > arch/arm/mach-at91/board-foxg20.c | 2 +- > arch/arm/mach-at91/board-gsia18s.c | 2 +- > arch/arm/mach-at91/board-kafa.c | 2 +- > arch/arm/mach-at91/board-kb9202.c | 2 +- > arch/arm/mach-at91/board-pcontrol-g20.c | 2 +- > arch/arm/mach-at91/board-picotux200.c | 2 +- > arch/arm/mach-at91/board-qil-a9260.c | 2 +- > arch/arm/mach-at91/board-rm9200dk.c | 2 +- > arch/arm/mach-at91/board-rm9200ek.c | 2 +- > arch/arm/mach-at91/board-rsi-ews.c | 3 ++- > arch/arm/mach-at91/board-sam9-l9260.c | 2 +- > arch/arm/mach-at91/board-sam9260ek.c | 2 +- > arch/arm/mach-at91/board-sam9261ek.c | 2 +- > arch/arm/mach-at91/board-sam9263ek.c | 2 +- > arch/arm/mach-at91/board-sam9g20ek.c | 2 +- > arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +- > arch/arm/mach-at91/board-sam9rlek.c | 2 +- > arch/arm/mach-at91/board-snapper9260.c | 2 +- > arch/arm/mach-at91/board-stamp9g20.c | 2 +- > arch/arm/mach-at91/board-usb-a926x.c | 2 +- > arch/arm/mach-at91/board-yl-9200.c | 2 +- > arch/arm/mach-at91/{ => include/mach}/at91_aic.h | 0 > arch/arm/mach-at91/pm.c | 2 +- > drivers/irqchip/Makefile | 1 + > .../mach-at91/irq.c => drivers/irqchip/irq-at91.c | 2 +- > 49 files changed, 54 insertions(+), 47 deletions(-) > > diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile > index 788562d..5333701 100644 > --- a/arch/arm/mach-at91/Makefile > +++ b/arch/arm/mach-at91/Makefile > @@ -2,7 +2,7 @@ > # Makefile for the linux kernel. > # > > -obj-y := irq.o gpio.o setup.o > +obj-y := gpio.o setup.o > obj-m := > obj-n := > obj- := > diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c > index d193a40..6c1204a 100644 > --- a/arch/arm/mach-at91/at91rm9200.c > +++ b/arch/arm/mach-at91/at91rm9200.c > @@ -20,8 +20,8 @@ > #include <mach/at91_pmc.h> > #include <mach/at91_st.h> > #include <mach/cpu.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "soc.h" > #include "generic.h" > #include "clock.h" > diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c > index a8ce245..55332fa 100644 > --- a/arch/arm/mach-at91/at91sam9260.c > +++ b/arch/arm/mach-at91/at91sam9260.c > @@ -21,8 +21,8 @@ > #include <mach/at91_dbgu.h> > #include <mach/at91sam9260.h> > #include <mach/at91_pmc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "at91_rstc.h" > #include "soc.h" > #include "generic.h" > diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c > index 25efb5a..6db61e6 100644 > --- a/arch/arm/mach-at91/at91sam9261.c > +++ b/arch/arm/mach-at91/at91sam9261.c > @@ -20,8 +20,8 @@ > #include <mach/cpu.h> > #include <mach/at91sam9261.h> > #include <mach/at91_pmc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "at91_rstc.h" > #include "soc.h" > #include "generic.h" > diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c > index f44ffd2..b9ec043 100644 > --- a/arch/arm/mach-at91/at91sam9263.c > +++ b/arch/arm/mach-at91/at91sam9263.c > @@ -19,8 +19,8 @@ > #include <asm/system_misc.h> > #include <mach/at91sam9263.h> > #include <mach/at91_pmc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "at91_rstc.h" > #include "soc.h" > #include "generic.h" > diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c > index 8b7fce0..1270707 100644 > --- a/arch/arm/mach-at91/at91sam9g45.c > +++ b/arch/arm/mach-at91/at91sam9g45.c > @@ -20,8 +20,8 @@ > #include <mach/at91sam9g45.h> > #include <mach/at91_pmc.h> > #include <mach/cpu.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "soc.h" > #include "generic.h" > #include "clock.h" > diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c > index f77fae5..d5f77d6 100644 > --- a/arch/arm/mach-at91/at91sam9rl.c > +++ b/arch/arm/mach-at91/at91sam9rl.c > @@ -20,8 +20,8 @@ > #include <mach/at91_dbgu.h> > #include <mach/at91sam9rl.h> > #include <mach/at91_pmc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "at91_rstc.h" > #include "soc.h" > #include "generic.h" > diff --git a/arch/arm/mach-at91/at91x40.c b/arch/arm/mach-at91/at91x40.c > index 19ca793..e8b30fb 100644 > --- a/arch/arm/mach-at91/at91x40.c > +++ b/arch/arm/mach-at91/at91x40.c > @@ -20,8 +20,8 @@ > #include <mach/at91x40.h> > #include <mach/at91_st.h> > #include <mach/timex.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "generic.h" > > /* > diff --git a/arch/arm/mach-at91/board-1arm.c b/arch/arm/mach-at91/board-1arm.c > index 35ab632..8037dfe 100644 > --- a/arch/arm/mach-at91/board-1arm.c > +++ b/arch/arm/mach-at91/board-1arm.c > @@ -34,9 +34,9 @@ > #include <asm/mach/map.h> > #include <asm/mach/irq.h> > > +#include <mach/at91_aic.h> > #include <mach/cpu.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c > index f95e31c..28bea23 100644 > --- a/arch/arm/mach-at91/board-afeb-9260v1.c > +++ b/arch/arm/mach-at91/board-afeb-9260v1.c > @@ -42,8 +42,8 @@ > #include <asm/mach/arch.h> > #include <asm/mach/map.h> > #include <asm/mach/irq.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c > index ade948b..6ebdf32 100644 > --- a/arch/arm/mach-at91/board-cam60.c > +++ b/arch/arm/mach-at91/board-cam60.c > @@ -39,8 +39,8 @@ > #include <asm/mach/irq.h> > > #include <mach/at91sam9_smc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "sam9_smc.h" > #include "generic.h" > diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c > index 9298305..842db49 100644 > --- a/arch/arm/mach-at91/board-carmeva.c > +++ b/arch/arm/mach-at91/board-carmeva.c > @@ -35,8 +35,8 @@ > #include <asm/mach/irq.h> > > #include <mach/hardware.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c > index 008527e..4714e9e 100644 > --- a/arch/arm/mach-at91/board-cpu9krea.c > +++ b/arch/arm/mach-at91/board-cpu9krea.c > @@ -43,8 +43,8 @@ > #include <mach/at91sam9_smc.h> > #include <mach/at91sam9260_matrix.h> > #include <mach/at91_matrix.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "sam9_smc.h" > #include "generic.h" > diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c > index 42f1353..c1663ed 100644 > --- a/arch/arm/mach-at91/board-cpuat91.c > +++ b/arch/arm/mach-at91/board-cpuat91.c > @@ -39,8 +39,8 @@ > #include <mach/at91rm9200_mc.h> > #include <mach/at91_ramc.h> > #include <mach/cpu.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c > index e5fde215..3231703 100644 > --- a/arch/arm/mach-at91/board-csb337.c > +++ b/arch/arm/mach-at91/board-csb337.c > @@ -38,8 +38,8 @@ > #include <asm/mach/irq.h> > > #include <mach/hardware.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c > index fdf1106..d58c7e6 100644 > --- a/arch/arm/mach-at91/board-csb637.c > +++ b/arch/arm/mach-at91/board-csb637.c > @@ -35,8 +35,8 @@ > #include <asm/mach/irq.h> > > #include <mach/hardware.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c > index 3fcb662..0c2a06d 100644 > --- a/arch/arm/mach-at91/board-dt-rm9200.c > +++ b/arch/arm/mach-at91/board-dt-rm9200.c > @@ -22,7 +22,8 @@ > #include <asm/mach/map.h> > #include <asm/mach/irq.h> > > -#include "at91_aic.h" > +#include <mach/at91_aic.h> > + > #include "generic.h" > > > diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/board-dt-sam9.c > index 8db3013..ac899d8 100644 > --- a/arch/arm/mach-at91/board-dt-sam9.c > +++ b/arch/arm/mach-at91/board-dt-sam9.c > @@ -21,7 +21,8 @@ > #include <asm/mach/map.h> > #include <asm/mach/irq.h> > > -#include "at91_aic.h" > +#include <mach/at91_aic.h> > + > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c > index 705305e..43b8f7a 100644 > --- a/arch/arm/mach-at91/board-dt-sama5.c > +++ b/arch/arm/mach-at91/board-dt-sama5.c > @@ -23,7 +23,8 @@ > #include <asm/mach/map.h> > #include <asm/mach/irq.h> > > -#include "at91_aic.h" > +#include <mach/at91_aic.h> > + > #include "generic.h" > > > diff --git a/arch/arm/mach-at91/board-eb01.c b/arch/arm/mach-at91/board-eb01.c > index becf0a6..4097ede 100644 > --- a/arch/arm/mach-at91/board-eb01.c > +++ b/arch/arm/mach-at91/board-eb01.c > @@ -28,7 +28,8 @@ > #include <asm/mach/arch.h> > #include <asm/mach/map.h> > > -#include "at91_aic.h" > +#include <mach/at91_aic.h> > + > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-eb9200.c b/arch/arm/mach-at91/board-eb9200.c > index f9be816..afa5ebb 100644 > --- a/arch/arm/mach-at91/board-eb9200.c > +++ b/arch/arm/mach-at91/board-eb9200.c > @@ -35,7 +35,8 @@ > #include <asm/mach/map.h> > #include <asm/mach/irq.h> > > -#include "at91_aic.h" > +#include <mach/at91_aic.h> > + > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c > index b2fcd71..c794768 100644 > --- a/arch/arm/mach-at91/board-ecbat91.c > +++ b/arch/arm/mach-at91/board-ecbat91.c > @@ -38,8 +38,8 @@ > #include <asm/mach/irq.h> > > #include <mach/cpu.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-eco920.c b/arch/arm/mach-at91/board-eco920.c > index 77de410..fc3e373 100644 > --- a/arch/arm/mach-at91/board-eco920.c > +++ b/arch/arm/mach-at91/board-eco920.c > @@ -27,8 +27,8 @@ > #include <mach/at91rm9200_mc.h> > #include <mach/at91_ramc.h> > #include <mach/cpu.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c > index 737c085..59a1958 100644 > --- a/arch/arm/mach-at91/board-flexibity.c > +++ b/arch/arm/mach-at91/board-flexibity.c > @@ -33,8 +33,8 @@ > #include <asm/mach/irq.h> > > #include <mach/hardware.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-foxg20.c b/arch/arm/mach-at91/board-foxg20.c > index c20a870..4b4df05 100644 > --- a/arch/arm/mach-at91/board-foxg20.c > +++ b/arch/arm/mach-at91/board-foxg20.c > @@ -42,8 +42,8 @@ > #include <asm/mach/irq.h> > > #include <mach/at91sam9_smc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "sam9_smc.h" > #include "generic.h" > diff --git a/arch/arm/mach-at91/board-gsia18s.c b/arch/arm/mach-at91/board-gsia18s.c > index c1d61d2..1babcbd 100644 > --- a/arch/arm/mach-at91/board-gsia18s.c > +++ b/arch/arm/mach-at91/board-gsia18s.c > @@ -31,8 +31,8 @@ > #include <asm/mach/arch.h> > > #include <mach/at91sam9_smc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "sam9_smc.h" > #include "generic.h" > diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c > index 88e2f5d..aca52d3 100644 > --- a/arch/arm/mach-at91/board-kafa.c > +++ b/arch/arm/mach-at91/board-kafa.c > @@ -35,8 +35,8 @@ > #include <asm/mach/irq.h> > > #include <mach/cpu.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c > index 0c519d9..7768df0 100644 > --- a/arch/arm/mach-at91/board-kb9202.c > +++ b/arch/arm/mach-at91/board-kb9202.c > @@ -38,8 +38,8 @@ > #include <mach/cpu.h> > #include <mach/at91rm9200_mc.h> > #include <mach/at91_ramc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-pcontrol-g20.c b/arch/arm/mach-at91/board-pcontrol-g20.c > index 65c0d6b..6df21db 100644 > --- a/arch/arm/mach-at91/board-pcontrol-g20.c > +++ b/arch/arm/mach-at91/board-pcontrol-g20.c > @@ -30,8 +30,8 @@ > #include <asm/mach/arch.h> > > #include <mach/at91sam9_smc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "sam9_smc.h" > #include "generic.h" > diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c > index ab2b2ec..566b30c 100644 > --- a/arch/arm/mach-at91/board-picotux200.c > +++ b/arch/arm/mach-at91/board-picotux200.c > @@ -39,8 +39,8 @@ > > #include <mach/at91rm9200_mc.h> > #include <mach/at91_ramc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c > index aa3bc9b..0ae5eb1 100644 > --- a/arch/arm/mach-at91/board-qil-a9260.c > +++ b/arch/arm/mach-at91/board-qil-a9260.c > @@ -41,8 +41,8 @@ > > #include <mach/hardware.h> > #include <mach/at91sam9_smc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "at91_shdwc.h" > #include "board.h" > #include "sam9_smc.h" > diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c > index 690541b..82f0335e 100644 > --- a/arch/arm/mach-at91/board-rm9200dk.c > +++ b/arch/arm/mach-at91/board-rm9200dk.c > @@ -41,8 +41,8 @@ > #include <mach/hardware.h> > #include <mach/at91rm9200_mc.h> > #include <mach/at91_ramc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-rm9200ek.c b/arch/arm/mach-at91/board-rm9200ek.c > index 8b17dad..5e8a4f7 100644 > --- a/arch/arm/mach-at91/board-rm9200ek.c > +++ b/arch/arm/mach-at91/board-rm9200ek.c > @@ -41,8 +41,8 @@ > #include <mach/hardware.h> > #include <mach/at91rm9200_mc.h> > #include <mach/at91_ramc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-rsi-ews.c b/arch/arm/mach-at91/board-rsi-ews.c > index f6d7f19..e7d0a69 100644 > --- a/arch/arm/mach-at91/board-rsi-ews.c > +++ b/arch/arm/mach-at91/board-rsi-ews.c > @@ -28,7 +28,8 @@ > > #include <linux/gpio.h> > > -#include "at91_aic.h" > +#include <mach/at91_aic.h> > + > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c > index 43ee4dc..2e400cd 100644 > --- a/arch/arm/mach-at91/board-sam9-l9260.c > +++ b/arch/arm/mach-at91/board-sam9-l9260.c > @@ -38,8 +38,8 @@ > #include <asm/mach/irq.h> > > #include <mach/at91sam9_smc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "sam9_smc.h" > #include "generic.h" > diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c > index 0b153c8..66ee7ac 100644 > --- a/arch/arm/mach-at91/board-sam9260ek.c > +++ b/arch/arm/mach-at91/board-sam9260ek.c > @@ -43,8 +43,8 @@ > #include <mach/hardware.h> > #include <mach/at91sam9_smc.h> > #include <mach/system_rev.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "at91_shdwc.h" > #include "board.h" > #include "sam9_smc.h" > diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c > index b446645..515957e 100644 > --- a/arch/arm/mach-at91/board-sam9261ek.c > +++ b/arch/arm/mach-at91/board-sam9261ek.c > @@ -47,8 +47,8 @@ > #include <mach/hardware.h> > #include <mach/at91sam9_smc.h> > #include <mach/system_rev.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "at91_shdwc.h" > #include "board.h" > #include "sam9_smc.h" > diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c > index 3284df0..1099272 100644 > --- a/arch/arm/mach-at91/board-sam9263ek.c > +++ b/arch/arm/mach-at91/board-sam9263ek.c > @@ -46,8 +46,8 @@ > #include <mach/hardware.h> > #include <mach/at91sam9_smc.h> > #include <mach/system_rev.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "at91_shdwc.h" > #include "board.h" > #include "sam9_smc.h" > diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c > index f9cd1f2..9fe718b 100644 > --- a/arch/arm/mach-at91/board-sam9g20ek.c > +++ b/arch/arm/mach-at91/board-sam9g20ek.c > @@ -45,8 +45,8 @@ > > #include <mach/at91sam9_smc.h> > #include <mach/system_rev.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "sam9_smc.h" > #include "generic.h" > diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c > index 2a94896..1846647 100644 > --- a/arch/arm/mach-at91/board-sam9m10g45ek.c > +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c > @@ -44,8 +44,8 @@ > > #include <mach/at91sam9_smc.h> > #include <mach/system_rev.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "at91_shdwc.h" > #include "board.h" > #include "sam9_smc.h" > diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c > index aa265dc..623f2d1 100644 > --- a/arch/arm/mach-at91/board-sam9rlek.c > +++ b/arch/arm/mach-at91/board-sam9rlek.c > @@ -31,9 +31,9 @@ > > #include <mach/hardware.h> > #include <mach/at91sam9_smc.h> > +#include <mach/at91_aic.h> > > > -#include "at91_aic.h" > #include "at91_shdwc.h" > #include "board.h" > #include "sam9_smc.h" > diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c > index 3aaa978..8fef38a 100644 > --- a/arch/arm/mach-at91/board-snapper9260.c > +++ b/arch/arm/mach-at91/board-snapper9260.c > @@ -33,8 +33,8 @@ > > #include <mach/hardware.h> > #include <mach/at91sam9_smc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "sam9_smc.h" > #include "generic.h" > diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c > index 869cbec..6bda942 100644 > --- a/arch/arm/mach-at91/board-stamp9g20.c > +++ b/arch/arm/mach-at91/board-stamp9g20.c > @@ -26,8 +26,8 @@ > #include <asm/mach/arch.h> > > #include <mach/at91sam9_smc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "sam9_smc.h" > #include "generic.h" > diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c > index 2487d94..cedbc66 100644 > --- a/arch/arm/mach-at91/board-usb-a926x.c > +++ b/arch/arm/mach-at91/board-usb-a926x.c > @@ -42,8 +42,8 @@ > > #include <mach/hardware.h> > #include <mach/at91sam9_smc.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "at91_shdwc.h" > #include "board.h" > #include "sam9_smc.h" > diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c > index be08377..c61d8c9 100644 > --- a/arch/arm/mach-at91/board-yl-9200.c > +++ b/arch/arm/mach-at91/board-yl-9200.c > @@ -46,8 +46,8 @@ > #include <mach/at91rm9200_mc.h> > #include <mach/at91_ramc.h> > #include <mach/cpu.h> > +#include <mach/at91_aic.h> > > -#include "at91_aic.h" > #include "board.h" > #include "generic.h" > > diff --git a/arch/arm/mach-at91/at91_aic.h b/arch/arm/mach-at91/include/mach/at91_aic.h > similarity index 100% > rename from arch/arm/mach-at91/at91_aic.h > rename to arch/arm/mach-at91/include/mach/at91_aic.h > diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c > index 530db30..d2a24e8 100644 > --- a/arch/arm/mach-at91/pm.c > +++ b/arch/arm/mach-at91/pm.c > @@ -26,9 +26,9 @@ > #include <asm/mach/irq.h> > > #include <mach/at91_pmc.h> > +#include <mach/at91_aic.h> > #include <mach/cpu.h> > > -#include "at91_aic.h" > #include "generic.h" > #include "pm.h" > > diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile > index cda4cb5..208b708 100644 > --- a/drivers/irqchip/Makefile > +++ b/drivers/irqchip/Makefile > @@ -1,5 +1,6 @@ > obj-$(CONFIG_IRQCHIP) += irqchip.o > > +obj-$(CONFIG_ARCH_AT91) += irq-at91.o > obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o > obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.o > obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o > diff --git a/arch/arm/mach-at91/irq.c b/drivers/irqchip/irq-at91.c > similarity index 99% > rename from arch/arm/mach-at91/irq.c > rename to drivers/irqchip/irq-at91.c > index e0ca591..daf2959 100644 > --- a/arch/arm/mach-at91/irq.c > +++ b/drivers/irqchip/irq-at91.c > @@ -42,7 +42,7 @@ > #include <asm/mach/irq.h> > #include <asm/mach/map.h> > > -#include "at91_aic.h" > +#include <mach/at91_aic.h> > > void __iomem *at91_aic_base; > static struct irq_domain *at91_aic_domain; > -- > 1.7.9.5 > ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 9:06 ` Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-23 9:51 ` boris brezillon 2013-05-23 10:09 ` Thomas Petazzoni 0 siblings, 1 reply; 20+ messages in thread From: boris brezillon @ 2013-05-23 9:51 UTC (permalink / raw) To: linux-arm-kernel On 23/05/2013 11:06, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 11:05 Thu 23 May , Boris BREZILLON wrote: >> Move arch/arm/mach-at91/irq.c to drivers/irqchip/irq-at91.c. >> Move arch/arm/mach-at91/at91_aic.h to >> arch/arm/mach-at91/include/mach/at91_aic.h to avoid ugly reference >> to header file : >> #include "../../arch/arm/mach-at91/at91_aic.h" > no we are going to drop arch/arm/mach-at91/include/mach for multi support > > arch/arm/mach-at91/include/mach is for removal What should be done ? include ../../arch/arm/mach-at91/at91_aic.h from irq-at91.c or move at91_aic.h into drivers/irqchips and patch every non dt board to include ../../../drivers/irqchip/at91_aic.h > > Best Regards, > J. >> Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> >> --- >> arch/arm/mach-at91/Makefile | 2 +- >> arch/arm/mach-at91/at91rm9200.c | 2 +- >> arch/arm/mach-at91/at91sam9260.c | 2 +- >> arch/arm/mach-at91/at91sam9261.c | 2 +- >> arch/arm/mach-at91/at91sam9263.c | 2 +- >> arch/arm/mach-at91/at91sam9g45.c | 2 +- >> arch/arm/mach-at91/at91sam9rl.c | 2 +- >> arch/arm/mach-at91/at91x40.c | 2 +- >> arch/arm/mach-at91/board-1arm.c | 2 +- >> arch/arm/mach-at91/board-afeb-9260v1.c | 2 +- >> arch/arm/mach-at91/board-cam60.c | 2 +- >> arch/arm/mach-at91/board-carmeva.c | 2 +- >> arch/arm/mach-at91/board-cpu9krea.c | 2 +- >> arch/arm/mach-at91/board-cpuat91.c | 2 +- >> arch/arm/mach-at91/board-csb337.c | 2 +- >> arch/arm/mach-at91/board-csb637.c | 2 +- >> arch/arm/mach-at91/board-dt-rm9200.c | 3 ++- >> arch/arm/mach-at91/board-dt-sam9.c | 3 ++- >> arch/arm/mach-at91/board-dt-sama5.c | 3 ++- >> arch/arm/mach-at91/board-eb01.c | 3 ++- >> arch/arm/mach-at91/board-eb9200.c | 3 ++- >> arch/arm/mach-at91/board-ecbat91.c | 2 +- >> arch/arm/mach-at91/board-eco920.c | 2 +- >> arch/arm/mach-at91/board-flexibity.c | 2 +- >> arch/arm/mach-at91/board-foxg20.c | 2 +- >> arch/arm/mach-at91/board-gsia18s.c | 2 +- >> arch/arm/mach-at91/board-kafa.c | 2 +- >> arch/arm/mach-at91/board-kb9202.c | 2 +- >> arch/arm/mach-at91/board-pcontrol-g20.c | 2 +- >> arch/arm/mach-at91/board-picotux200.c | 2 +- >> arch/arm/mach-at91/board-qil-a9260.c | 2 +- >> arch/arm/mach-at91/board-rm9200dk.c | 2 +- >> arch/arm/mach-at91/board-rm9200ek.c | 2 +- >> arch/arm/mach-at91/board-rsi-ews.c | 3 ++- >> arch/arm/mach-at91/board-sam9-l9260.c | 2 +- >> arch/arm/mach-at91/board-sam9260ek.c | 2 +- >> arch/arm/mach-at91/board-sam9261ek.c | 2 +- >> arch/arm/mach-at91/board-sam9263ek.c | 2 +- >> arch/arm/mach-at91/board-sam9g20ek.c | 2 +- >> arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +- >> arch/arm/mach-at91/board-sam9rlek.c | 2 +- >> arch/arm/mach-at91/board-snapper9260.c | 2 +- >> arch/arm/mach-at91/board-stamp9g20.c | 2 +- >> arch/arm/mach-at91/board-usb-a926x.c | 2 +- >> arch/arm/mach-at91/board-yl-9200.c | 2 +- >> arch/arm/mach-at91/{ => include/mach}/at91_aic.h | 0 >> arch/arm/mach-at91/pm.c | 2 +- >> drivers/irqchip/Makefile | 1 + >> .../mach-at91/irq.c => drivers/irqchip/irq-at91.c | 2 +- >> 49 files changed, 54 insertions(+), 47 deletions(-) >> >> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile >> index 788562d..5333701 100644 >> --- a/arch/arm/mach-at91/Makefile >> +++ b/arch/arm/mach-at91/Makefile >> @@ -2,7 +2,7 @@ >> # Makefile for the linux kernel. >> # >> >> -obj-y := irq.o gpio.o setup.o >> +obj-y := gpio.o setup.o >> obj-m := >> obj-n := >> obj- := >> diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c >> index d193a40..6c1204a 100644 >> --- a/arch/arm/mach-at91/at91rm9200.c >> +++ b/arch/arm/mach-at91/at91rm9200.c >> @@ -20,8 +20,8 @@ >> #include <mach/at91_pmc.h> >> #include <mach/at91_st.h> >> #include <mach/cpu.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "soc.h" >> #include "generic.h" >> #include "clock.h" >> diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c >> index a8ce245..55332fa 100644 >> --- a/arch/arm/mach-at91/at91sam9260.c >> +++ b/arch/arm/mach-at91/at91sam9260.c >> @@ -21,8 +21,8 @@ >> #include <mach/at91_dbgu.h> >> #include <mach/at91sam9260.h> >> #include <mach/at91_pmc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "at91_rstc.h" >> #include "soc.h" >> #include "generic.h" >> diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c >> index 25efb5a..6db61e6 100644 >> --- a/arch/arm/mach-at91/at91sam9261.c >> +++ b/arch/arm/mach-at91/at91sam9261.c >> @@ -20,8 +20,8 @@ >> #include <mach/cpu.h> >> #include <mach/at91sam9261.h> >> #include <mach/at91_pmc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "at91_rstc.h" >> #include "soc.h" >> #include "generic.h" >> diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c >> index f44ffd2..b9ec043 100644 >> --- a/arch/arm/mach-at91/at91sam9263.c >> +++ b/arch/arm/mach-at91/at91sam9263.c >> @@ -19,8 +19,8 @@ >> #include <asm/system_misc.h> >> #include <mach/at91sam9263.h> >> #include <mach/at91_pmc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "at91_rstc.h" >> #include "soc.h" >> #include "generic.h" >> diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c >> index 8b7fce0..1270707 100644 >> --- a/arch/arm/mach-at91/at91sam9g45.c >> +++ b/arch/arm/mach-at91/at91sam9g45.c >> @@ -20,8 +20,8 @@ >> #include <mach/at91sam9g45.h> >> #include <mach/at91_pmc.h> >> #include <mach/cpu.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "soc.h" >> #include "generic.h" >> #include "clock.h" >> diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c >> index f77fae5..d5f77d6 100644 >> --- a/arch/arm/mach-at91/at91sam9rl.c >> +++ b/arch/arm/mach-at91/at91sam9rl.c >> @@ -20,8 +20,8 @@ >> #include <mach/at91_dbgu.h> >> #include <mach/at91sam9rl.h> >> #include <mach/at91_pmc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "at91_rstc.h" >> #include "soc.h" >> #include "generic.h" >> diff --git a/arch/arm/mach-at91/at91x40.c b/arch/arm/mach-at91/at91x40.c >> index 19ca793..e8b30fb 100644 >> --- a/arch/arm/mach-at91/at91x40.c >> +++ b/arch/arm/mach-at91/at91x40.c >> @@ -20,8 +20,8 @@ >> #include <mach/at91x40.h> >> #include <mach/at91_st.h> >> #include <mach/timex.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "generic.h" >> >> /* >> diff --git a/arch/arm/mach-at91/board-1arm.c b/arch/arm/mach-at91/board-1arm.c >> index 35ab632..8037dfe 100644 >> --- a/arch/arm/mach-at91/board-1arm.c >> +++ b/arch/arm/mach-at91/board-1arm.c >> @@ -34,9 +34,9 @@ >> #include <asm/mach/map.h> >> #include <asm/mach/irq.h> >> >> +#include <mach/at91_aic.h> >> #include <mach/cpu.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c >> index f95e31c..28bea23 100644 >> --- a/arch/arm/mach-at91/board-afeb-9260v1.c >> +++ b/arch/arm/mach-at91/board-afeb-9260v1.c >> @@ -42,8 +42,8 @@ >> #include <asm/mach/arch.h> >> #include <asm/mach/map.h> >> #include <asm/mach/irq.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c >> index ade948b..6ebdf32 100644 >> --- a/arch/arm/mach-at91/board-cam60.c >> +++ b/arch/arm/mach-at91/board-cam60.c >> @@ -39,8 +39,8 @@ >> #include <asm/mach/irq.h> >> >> #include <mach/at91sam9_smc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "sam9_smc.h" >> #include "generic.h" >> diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c >> index 9298305..842db49 100644 >> --- a/arch/arm/mach-at91/board-carmeva.c >> +++ b/arch/arm/mach-at91/board-carmeva.c >> @@ -35,8 +35,8 @@ >> #include <asm/mach/irq.h> >> >> #include <mach/hardware.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c >> index 008527e..4714e9e 100644 >> --- a/arch/arm/mach-at91/board-cpu9krea.c >> +++ b/arch/arm/mach-at91/board-cpu9krea.c >> @@ -43,8 +43,8 @@ >> #include <mach/at91sam9_smc.h> >> #include <mach/at91sam9260_matrix.h> >> #include <mach/at91_matrix.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "sam9_smc.h" >> #include "generic.h" >> diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c >> index 42f1353..c1663ed 100644 >> --- a/arch/arm/mach-at91/board-cpuat91.c >> +++ b/arch/arm/mach-at91/board-cpuat91.c >> @@ -39,8 +39,8 @@ >> #include <mach/at91rm9200_mc.h> >> #include <mach/at91_ramc.h> >> #include <mach/cpu.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c >> index e5fde215..3231703 100644 >> --- a/arch/arm/mach-at91/board-csb337.c >> +++ b/arch/arm/mach-at91/board-csb337.c >> @@ -38,8 +38,8 @@ >> #include <asm/mach/irq.h> >> >> #include <mach/hardware.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c >> index fdf1106..d58c7e6 100644 >> --- a/arch/arm/mach-at91/board-csb637.c >> +++ b/arch/arm/mach-at91/board-csb637.c >> @@ -35,8 +35,8 @@ >> #include <asm/mach/irq.h> >> >> #include <mach/hardware.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c >> index 3fcb662..0c2a06d 100644 >> --- a/arch/arm/mach-at91/board-dt-rm9200.c >> +++ b/arch/arm/mach-at91/board-dt-rm9200.c >> @@ -22,7 +22,8 @@ >> #include <asm/mach/map.h> >> #include <asm/mach/irq.h> >> >> -#include "at91_aic.h" >> +#include <mach/at91_aic.h> >> + >> #include "generic.h" >> >> >> diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/board-dt-sam9.c >> index 8db3013..ac899d8 100644 >> --- a/arch/arm/mach-at91/board-dt-sam9.c >> +++ b/arch/arm/mach-at91/board-dt-sam9.c >> @@ -21,7 +21,8 @@ >> #include <asm/mach/map.h> >> #include <asm/mach/irq.h> >> >> -#include "at91_aic.h" >> +#include <mach/at91_aic.h> >> + >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c >> index 705305e..43b8f7a 100644 >> --- a/arch/arm/mach-at91/board-dt-sama5.c >> +++ b/arch/arm/mach-at91/board-dt-sama5.c >> @@ -23,7 +23,8 @@ >> #include <asm/mach/map.h> >> #include <asm/mach/irq.h> >> >> -#include "at91_aic.h" >> +#include <mach/at91_aic.h> >> + >> #include "generic.h" >> >> >> diff --git a/arch/arm/mach-at91/board-eb01.c b/arch/arm/mach-at91/board-eb01.c >> index becf0a6..4097ede 100644 >> --- a/arch/arm/mach-at91/board-eb01.c >> +++ b/arch/arm/mach-at91/board-eb01.c >> @@ -28,7 +28,8 @@ >> #include <asm/mach/arch.h> >> #include <asm/mach/map.h> >> >> -#include "at91_aic.h" >> +#include <mach/at91_aic.h> >> + >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-eb9200.c b/arch/arm/mach-at91/board-eb9200.c >> index f9be816..afa5ebb 100644 >> --- a/arch/arm/mach-at91/board-eb9200.c >> +++ b/arch/arm/mach-at91/board-eb9200.c >> @@ -35,7 +35,8 @@ >> #include <asm/mach/map.h> >> #include <asm/mach/irq.h> >> >> -#include "at91_aic.h" >> +#include <mach/at91_aic.h> >> + >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c >> index b2fcd71..c794768 100644 >> --- a/arch/arm/mach-at91/board-ecbat91.c >> +++ b/arch/arm/mach-at91/board-ecbat91.c >> @@ -38,8 +38,8 @@ >> #include <asm/mach/irq.h> >> >> #include <mach/cpu.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-eco920.c b/arch/arm/mach-at91/board-eco920.c >> index 77de410..fc3e373 100644 >> --- a/arch/arm/mach-at91/board-eco920.c >> +++ b/arch/arm/mach-at91/board-eco920.c >> @@ -27,8 +27,8 @@ >> #include <mach/at91rm9200_mc.h> >> #include <mach/at91_ramc.h> >> #include <mach/cpu.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c >> index 737c085..59a1958 100644 >> --- a/arch/arm/mach-at91/board-flexibity.c >> +++ b/arch/arm/mach-at91/board-flexibity.c >> @@ -33,8 +33,8 @@ >> #include <asm/mach/irq.h> >> >> #include <mach/hardware.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-foxg20.c b/arch/arm/mach-at91/board-foxg20.c >> index c20a870..4b4df05 100644 >> --- a/arch/arm/mach-at91/board-foxg20.c >> +++ b/arch/arm/mach-at91/board-foxg20.c >> @@ -42,8 +42,8 @@ >> #include <asm/mach/irq.h> >> >> #include <mach/at91sam9_smc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "sam9_smc.h" >> #include "generic.h" >> diff --git a/arch/arm/mach-at91/board-gsia18s.c b/arch/arm/mach-at91/board-gsia18s.c >> index c1d61d2..1babcbd 100644 >> --- a/arch/arm/mach-at91/board-gsia18s.c >> +++ b/arch/arm/mach-at91/board-gsia18s.c >> @@ -31,8 +31,8 @@ >> #include <asm/mach/arch.h> >> >> #include <mach/at91sam9_smc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "sam9_smc.h" >> #include "generic.h" >> diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c >> index 88e2f5d..aca52d3 100644 >> --- a/arch/arm/mach-at91/board-kafa.c >> +++ b/arch/arm/mach-at91/board-kafa.c >> @@ -35,8 +35,8 @@ >> #include <asm/mach/irq.h> >> >> #include <mach/cpu.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c >> index 0c519d9..7768df0 100644 >> --- a/arch/arm/mach-at91/board-kb9202.c >> +++ b/arch/arm/mach-at91/board-kb9202.c >> @@ -38,8 +38,8 @@ >> #include <mach/cpu.h> >> #include <mach/at91rm9200_mc.h> >> #include <mach/at91_ramc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-pcontrol-g20.c b/arch/arm/mach-at91/board-pcontrol-g20.c >> index 65c0d6b..6df21db 100644 >> --- a/arch/arm/mach-at91/board-pcontrol-g20.c >> +++ b/arch/arm/mach-at91/board-pcontrol-g20.c >> @@ -30,8 +30,8 @@ >> #include <asm/mach/arch.h> >> >> #include <mach/at91sam9_smc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "sam9_smc.h" >> #include "generic.h" >> diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c >> index ab2b2ec..566b30c 100644 >> --- a/arch/arm/mach-at91/board-picotux200.c >> +++ b/arch/arm/mach-at91/board-picotux200.c >> @@ -39,8 +39,8 @@ >> >> #include <mach/at91rm9200_mc.h> >> #include <mach/at91_ramc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c >> index aa3bc9b..0ae5eb1 100644 >> --- a/arch/arm/mach-at91/board-qil-a9260.c >> +++ b/arch/arm/mach-at91/board-qil-a9260.c >> @@ -41,8 +41,8 @@ >> >> #include <mach/hardware.h> >> #include <mach/at91sam9_smc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "at91_shdwc.h" >> #include "board.h" >> #include "sam9_smc.h" >> diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c >> index 690541b..82f0335e 100644 >> --- a/arch/arm/mach-at91/board-rm9200dk.c >> +++ b/arch/arm/mach-at91/board-rm9200dk.c >> @@ -41,8 +41,8 @@ >> #include <mach/hardware.h> >> #include <mach/at91rm9200_mc.h> >> #include <mach/at91_ramc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-rm9200ek.c b/arch/arm/mach-at91/board-rm9200ek.c >> index 8b17dad..5e8a4f7 100644 >> --- a/arch/arm/mach-at91/board-rm9200ek.c >> +++ b/arch/arm/mach-at91/board-rm9200ek.c >> @@ -41,8 +41,8 @@ >> #include <mach/hardware.h> >> #include <mach/at91rm9200_mc.h> >> #include <mach/at91_ramc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-rsi-ews.c b/arch/arm/mach-at91/board-rsi-ews.c >> index f6d7f19..e7d0a69 100644 >> --- a/arch/arm/mach-at91/board-rsi-ews.c >> +++ b/arch/arm/mach-at91/board-rsi-ews.c >> @@ -28,7 +28,8 @@ >> >> #include <linux/gpio.h> >> >> -#include "at91_aic.h" >> +#include <mach/at91_aic.h> >> + >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c >> index 43ee4dc..2e400cd 100644 >> --- a/arch/arm/mach-at91/board-sam9-l9260.c >> +++ b/arch/arm/mach-at91/board-sam9-l9260.c >> @@ -38,8 +38,8 @@ >> #include <asm/mach/irq.h> >> >> #include <mach/at91sam9_smc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "sam9_smc.h" >> #include "generic.h" >> diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c >> index 0b153c8..66ee7ac 100644 >> --- a/arch/arm/mach-at91/board-sam9260ek.c >> +++ b/arch/arm/mach-at91/board-sam9260ek.c >> @@ -43,8 +43,8 @@ >> #include <mach/hardware.h> >> #include <mach/at91sam9_smc.h> >> #include <mach/system_rev.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "at91_shdwc.h" >> #include "board.h" >> #include "sam9_smc.h" >> diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c >> index b446645..515957e 100644 >> --- a/arch/arm/mach-at91/board-sam9261ek.c >> +++ b/arch/arm/mach-at91/board-sam9261ek.c >> @@ -47,8 +47,8 @@ >> #include <mach/hardware.h> >> #include <mach/at91sam9_smc.h> >> #include <mach/system_rev.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "at91_shdwc.h" >> #include "board.h" >> #include "sam9_smc.h" >> diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c >> index 3284df0..1099272 100644 >> --- a/arch/arm/mach-at91/board-sam9263ek.c >> +++ b/arch/arm/mach-at91/board-sam9263ek.c >> @@ -46,8 +46,8 @@ >> #include <mach/hardware.h> >> #include <mach/at91sam9_smc.h> >> #include <mach/system_rev.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "at91_shdwc.h" >> #include "board.h" >> #include "sam9_smc.h" >> diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c >> index f9cd1f2..9fe718b 100644 >> --- a/arch/arm/mach-at91/board-sam9g20ek.c >> +++ b/arch/arm/mach-at91/board-sam9g20ek.c >> @@ -45,8 +45,8 @@ >> >> #include <mach/at91sam9_smc.h> >> #include <mach/system_rev.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "sam9_smc.h" >> #include "generic.h" >> diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c >> index 2a94896..1846647 100644 >> --- a/arch/arm/mach-at91/board-sam9m10g45ek.c >> +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c >> @@ -44,8 +44,8 @@ >> >> #include <mach/at91sam9_smc.h> >> #include <mach/system_rev.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "at91_shdwc.h" >> #include "board.h" >> #include "sam9_smc.h" >> diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c >> index aa265dc..623f2d1 100644 >> --- a/arch/arm/mach-at91/board-sam9rlek.c >> +++ b/arch/arm/mach-at91/board-sam9rlek.c >> @@ -31,9 +31,9 @@ >> >> #include <mach/hardware.h> >> #include <mach/at91sam9_smc.h> >> +#include <mach/at91_aic.h> >> >> >> -#include "at91_aic.h" >> #include "at91_shdwc.h" >> #include "board.h" >> #include "sam9_smc.h" >> diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c >> index 3aaa978..8fef38a 100644 >> --- a/arch/arm/mach-at91/board-snapper9260.c >> +++ b/arch/arm/mach-at91/board-snapper9260.c >> @@ -33,8 +33,8 @@ >> >> #include <mach/hardware.h> >> #include <mach/at91sam9_smc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "sam9_smc.h" >> #include "generic.h" >> diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c >> index 869cbec..6bda942 100644 >> --- a/arch/arm/mach-at91/board-stamp9g20.c >> +++ b/arch/arm/mach-at91/board-stamp9g20.c >> @@ -26,8 +26,8 @@ >> #include <asm/mach/arch.h> >> >> #include <mach/at91sam9_smc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "sam9_smc.h" >> #include "generic.h" >> diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c >> index 2487d94..cedbc66 100644 >> --- a/arch/arm/mach-at91/board-usb-a926x.c >> +++ b/arch/arm/mach-at91/board-usb-a926x.c >> @@ -42,8 +42,8 @@ >> >> #include <mach/hardware.h> >> #include <mach/at91sam9_smc.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "at91_shdwc.h" >> #include "board.h" >> #include "sam9_smc.h" >> diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c >> index be08377..c61d8c9 100644 >> --- a/arch/arm/mach-at91/board-yl-9200.c >> +++ b/arch/arm/mach-at91/board-yl-9200.c >> @@ -46,8 +46,8 @@ >> #include <mach/at91rm9200_mc.h> >> #include <mach/at91_ramc.h> >> #include <mach/cpu.h> >> +#include <mach/at91_aic.h> >> >> -#include "at91_aic.h" >> #include "board.h" >> #include "generic.h" >> >> diff --git a/arch/arm/mach-at91/at91_aic.h b/arch/arm/mach-at91/include/mach/at91_aic.h >> similarity index 100% >> rename from arch/arm/mach-at91/at91_aic.h >> rename to arch/arm/mach-at91/include/mach/at91_aic.h >> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c >> index 530db30..d2a24e8 100644 >> --- a/arch/arm/mach-at91/pm.c >> +++ b/arch/arm/mach-at91/pm.c >> @@ -26,9 +26,9 @@ >> #include <asm/mach/irq.h> >> >> #include <mach/at91_pmc.h> >> +#include <mach/at91_aic.h> >> #include <mach/cpu.h> >> >> -#include "at91_aic.h" >> #include "generic.h" >> #include "pm.h" >> >> diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile >> index cda4cb5..208b708 100644 >> --- a/drivers/irqchip/Makefile >> +++ b/drivers/irqchip/Makefile >> @@ -1,5 +1,6 @@ >> obj-$(CONFIG_IRQCHIP) += irqchip.o >> >> +obj-$(CONFIG_ARCH_AT91) += irq-at91.o >> obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o >> obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.o >> obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o >> diff --git a/arch/arm/mach-at91/irq.c b/drivers/irqchip/irq-at91.c >> similarity index 99% >> rename from arch/arm/mach-at91/irq.c >> rename to drivers/irqchip/irq-at91.c >> index e0ca591..daf2959 100644 >> --- a/arch/arm/mach-at91/irq.c >> +++ b/drivers/irqchip/irq-at91.c >> @@ -42,7 +42,7 @@ >> #include <asm/mach/irq.h> >> #include <asm/mach/map.h> >> >> -#include "at91_aic.h" >> +#include <mach/at91_aic.h> >> >> void __iomem *at91_aic_base; >> static struct irq_domain *at91_aic_domain; >> -- >> 1.7.9.5 >> ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 9:51 ` boris brezillon @ 2013-05-23 10:09 ` Thomas Petazzoni 2013-05-23 10:09 ` Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 1 reply; 20+ messages in thread From: Thomas Petazzoni @ 2013-05-23 10:09 UTC (permalink / raw) To: linux-arm-kernel Dear boris brezillon, On Thu, 23 May 2013 11:51:36 +0200, boris brezillon wrote: > On 23/05/2013 11:06, Jean-Christophe PLAGNIOL-VILLARD wrote: > > On 11:05 Thu 23 May , Boris BREZILLON wrote: > >> Move arch/arm/mach-at91/irq.c to drivers/irqchip/irq-at91.c. > >> Move arch/arm/mach-at91/at91_aic.h to > >> arch/arm/mach-at91/include/mach/at91_aic.h to avoid ugly reference > >> to header file : > >> #include "../../arch/arm/mach-at91/at91_aic.h" > > no we are going to drop arch/arm/mach-at91/include/mach for multi support > > > > arch/arm/mach-at91/include/mach is for removal > What should be done ? > > include ../../arch/arm/mach-at91/at91_aic.h from irq-at91.c > > or > > move at91_aic.h into drivers/irqchips and patch every non dt board to > include ../../../drivers/irqchip/at91_aic.h You can put it in <linux/irqchip/at91-aic.h>, there are already a few headers there. But I think it's not the right solution. *However*, ideally, this header should disappear completely. All the register defines should go directly into the driver C file. The only usage of the AIC defines outside of the IRQ driver are for debug prints in the pm.c code, which I think you could get rid of. Ditto for the at91_aic_{read,write} macros. The NR_AIC5_IRQS can also move to the driver itself. The only remaining one would be NR_AIC_IRQS, you can't get rid of it, because it's used for the IRQ priority arrays. But I believe keeping this one in <linux/irqchip/at91-aic.h> is reasonable. Best regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 10:09 ` Thomas Petazzoni @ 2013-05-23 10:09 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-23 10:20 ` Thomas Petazzoni 0 siblings, 1 reply; 20+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-23 10:09 UTC (permalink / raw) To: linux-arm-kernel On 12:09 Thu 23 May , Thomas Petazzoni wrote: > Dear boris brezillon, > > On Thu, 23 May 2013 11:51:36 +0200, boris brezillon wrote: > > On 23/05/2013 11:06, Jean-Christophe PLAGNIOL-VILLARD wrote: > > > On 11:05 Thu 23 May , Boris BREZILLON wrote: > > >> Move arch/arm/mach-at91/irq.c to drivers/irqchip/irq-at91.c. > > >> Move arch/arm/mach-at91/at91_aic.h to > > >> arch/arm/mach-at91/include/mach/at91_aic.h to avoid ugly reference > > >> to header file : > > >> #include "../../arch/arm/mach-at91/at91_aic.h" > > > no we are going to drop arch/arm/mach-at91/include/mach for multi support > > > > > > arch/arm/mach-at91/include/mach is for removal > > What should be done ? > > > > include ../../arch/arm/mach-at91/at91_aic.h from irq-at91.c > > > > or > > > > move at91_aic.h into drivers/irqchips and patch every non dt board to > > include ../../../drivers/irqchip/at91_aic.h > > You can put it in <linux/irqchip/at91-aic.h>, there are already a few > headers there. But I think it's not the right solution. > > *However*, ideally, this header should disappear completely. All the > register defines should go directly into the driver C file. The only > usage of the AIC defines outside of the IRQ driver are for debug prints > in the pm.c code, which I think you could get rid of. > > Ditto for the at91_aic_{read,write} macros. > > The NR_AIC5_IRQS can also move to the driver itself. > > The only remaining one would be NR_AIC_IRQS, you can't get rid of it, > because it's used for the IRQ priority arrays. But I believe keeping > this one in <linux/irqchip/at91-aic.h> is reasonable. do want either as we expose the register acces for pm & co until this is cleanup NACK Best Regards, J. ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 10:09 ` Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-23 10:20 ` Thomas Petazzoni 2013-05-23 10:26 ` Jean-Christophe PLAGNIOL-VILLARD 0 siblings, 1 reply; 20+ messages in thread From: Thomas Petazzoni @ 2013-05-23 10:20 UTC (permalink / raw) To: linux-arm-kernel Dear Jean-Christophe PLAGNIOL-VILLARD, On Thu, 23 May 2013 12:09:51 +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > > You can put it in <linux/irqchip/at91-aic.h>, there are already a few > > headers there. But I think it's not the right solution. > > > > *However*, ideally, this header should disappear completely. All the > > register defines should go directly into the driver C file. The only > > usage of the AIC defines outside of the IRQ driver are for debug prints > > in the pm.c code, which I think you could get rid of. > > > > Ditto for the at91_aic_{read,write} macros. > > > > The NR_AIC5_IRQS can also move to the driver itself. > > > > The only remaining one would be NR_AIC_IRQS, you can't get rid of it, > > because it's used for the IRQ priority arrays. But I believe keeping > > this one in <linux/irqchip/at91-aic.h> is reasonable. > > do want either as we expose the register acces for pm & co Did you read what I write? In arch/arm/mach-at91/pm.c, the only accesses made to the AIC registers are for pr_debug() calls, i.e only to print some debugging messages. I believe those ones can simply be removed to decouple the pm.c code from the irq.c code. > until this is cleanup NACK Is this really the way we want to welcome contributions in the kernel community? Boris, what you'd have to do is just do a few preparations patches in your patch set. Something like: * PATCH 1: remove usage of AIC registers for debug messages in pm.c * PATCH 2: move all of at91_aic.h in irq.c, except NR_AIC_IRQS * PATCH 3: move irq.c to drivers/irqchip/, and at91_aic.h to include/linux/irqchip/, and adjust what's necessary * and then your other patches. Best regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 10:20 ` Thomas Petazzoni @ 2013-05-23 10:26 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-23 11:22 ` Thomas Petazzoni 0 siblings, 1 reply; 20+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-23 10:26 UTC (permalink / raw) To: linux-arm-kernel On 12:20 Thu 23 May , Thomas Petazzoni wrote: > Dear Jean-Christophe PLAGNIOL-VILLARD, > > On Thu, 23 May 2013 12:09:51 +0200, Jean-Christophe PLAGNIOL-VILLARD > wrote: > > > > You can put it in <linux/irqchip/at91-aic.h>, there are already a few > > > headers there. But I think it's not the right solution. > > > > > > *However*, ideally, this header should disappear completely. All the > > > register defines should go directly into the driver C file. The only > > > usage of the AIC defines outside of the IRQ driver are for debug prints > > > in the pm.c code, which I think you could get rid of. > > > > > > Ditto for the at91_aic_{read,write} macros. > > > > > > The NR_AIC5_IRQS can also move to the driver itself. > > > > > > The only remaining one would be NR_AIC_IRQS, you can't get rid of it, > > > because it's used for the IRQ priority arrays. But I believe keeping > > > this one in <linux/irqchip/at91-aic.h> is reasonable. > > > > do want either as we expose the register acces for pm & co > > Did you read what I write? In arch/arm/mach-at91/pm.c, the only > accesses made to the AIC registers are for pr_debug() calls, i.e only > to print some debugging messages. I believe those ones can simply be > removed to decouple the pm.c code from the irq.c code. yes I read and yes I do not want to move code before we do cleanup MANDATORY unclean code in mach-at91 is fine this is legacy, move them arround NACK we cleanup first > > > until this is cleanup NACK > > Is this really the way we want to welcome contributions in the kernel > community? > > Boris, what you'd have to do is just do a few preparations patches > in your patch set. Something like: > > * PATCH 1: remove usage of AIC registers for debug messages in pm.c NACK I do want this debug, very usefull to debug pm Best Regards, J. > * PATCH 2: move all of at91_aic.h in irq.c, except NR_AIC_IRQS > * PATCH 3: move irq.c to drivers/irqchip/, and at91_aic.h to > include/linux/irqchip/, and adjust what's necessary > * and then your other patches. > > Best regards, > > Thomas > -- > Thomas Petazzoni, Free Electrons > Kernel, drivers, real-time and embedded Linux > development, consulting, training and support. > http://free-electrons.com ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 10:26 ` Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-23 11:22 ` Thomas Petazzoni 2013-05-23 11:58 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-23 13:00 ` Nicolas Ferre 0 siblings, 2 replies; 20+ messages in thread From: Thomas Petazzoni @ 2013-05-23 11:22 UTC (permalink / raw) To: linux-arm-kernel Dear Jean-Christophe PLAGNIOL-VILLARD, On Thu, 23 May 2013 12:26:01 +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > > Did you read what I write? In arch/arm/mach-at91/pm.c, the only > > accesses made to the AIC registers are for pr_debug() calls, i.e only > > to print some debugging messages. I believe those ones can simply be > > removed to decouple the pm.c code from the irq.c code. > > yes I read and yes I do not want to move code before we do cleanup MANDATORY Then please explain to our volunteer contributor what sort of cleanup is required. Simply NACKing without offering any insight as to how things should be done is completely useless, counter-productive, and a complete abuse of a maintainer's power over contributors. > > * PATCH 1: remove usage of AIC registers for debug messages in pm.c > NACK I do want this debug, very usefull to debug pm For the cases where you need to debug this stuff, you can always re-add some instrumentation in this code to dump whatever you want. Or, alternatively, we can make the irqchip driver show using pr_debug() the value of IMR in its ->suspend() hook, the value of IMR & IPR in its ->resume() hook, and the pm.c code can show the PMC_PCSR on suspend. This way, you have all the informations you need for debugging. Having the PM driver and the irqchip driver step on each other register areas is anyway a bad idea, especially when the only reason to do so is for two debugging messages that can be implemented differently. Notice that this solution can always be improved later on if needed, with further cleanups from you. But please stop rejecting valid patches from contributors, just because the code is not coming from you. What Boris is proposing is perfectly fine, just needs a little bit more work to sort out the header problems as we discussed, and is a good step in the right direction. And this step in the right direction doesn't prevent anyone else, including you, to provide additional patches to move even further in the right direction. It would be good if the other AT91 maintainers could raise their voice here, so that Boris knows whether it is worthwhile doing additional revisions of this patch set. Best regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 11:22 ` Thomas Petazzoni @ 2013-05-23 11:58 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-23 12:09 ` Thomas Petazzoni 2013-05-23 13:00 ` Nicolas Ferre 1 sibling, 1 reply; 20+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-23 11:58 UTC (permalink / raw) To: linux-arm-kernel On 13:22 Thu 23 May , Thomas Petazzoni wrote: > Dear Jean-Christophe PLAGNIOL-VILLARD, > > On Thu, 23 May 2013 12:26:01 +0200, Jean-Christophe PLAGNIOL-VILLARD > wrote: > > > > Did you read what I write? In arch/arm/mach-at91/pm.c, the only > > > accesses made to the AIC registers are for pr_debug() calls, i.e only > > > to print some debugging messages. I believe those ones can simply be > > > removed to decouple the pm.c code from the irq.c code. > > > > yes I read and yes I do not want to move code before we do cleanup MANDATORY > > Then please explain to our volunteer contributor what sort of cleanup > is required. Simply NACKing without offering any insight as to how > things should be done is completely useless, counter-productive, and a > complete abuse of a maintainer's power over contributors. > > > > * PATCH 1: remove usage of AIC registers for debug messages in pm.c > > NACK I do want this debug, very usefull to debug pm > > For the cases where you need to debug this stuff, you can always re-add > some instrumentation in this code to dump whatever you want. > > Or, alternatively, we can make the irqchip driver show using > pr_debug() the value of IMR in its ->suspend() hook, the value of IMR & > IPR in its ->resume() hook, and the pm.c code can show the PMC_PCSR on > suspend. This way, you have all the informations you need for debugging. if you read the code as you said both of them are link PMC & AIC so you can not hope to split it as both of the IP contain part of the information so no I want the information right where it's > > Having the PM driver and the irqchip driver step on each other register > areas is anyway a bad idea, especially when the only reason to do so is > for two debugging messages that can be implemented differently. > > Notice that this solution can always be improved later on if needed, > with further cleanups from you. > > But please stop rejecting valid patches from contributors, just because > the code is not coming from you. What Boris is proposing is perfectly so If I read you non clean code can come mainline, wow this not the way to work. If for you do half clean is enough to go mainline. You really need to change your way of working. Best Regards, J. ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 11:58 ` Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-23 12:09 ` Thomas Petazzoni 0 siblings, 0 replies; 20+ messages in thread From: Thomas Petazzoni @ 2013-05-23 12:09 UTC (permalink / raw) To: linux-arm-kernel Dear Jean-Christophe PLAGNIOL-VILLARD, On Thu, 23 May 2013 13:58:45 +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > > Or, alternatively, we can make the irqchip driver show using > > pr_debug() the value of IMR in its ->suspend() hook, the value of IMR & > > IPR in its ->resume() hook, and the pm.c code can show the PMC_PCSR on > > suspend. This way, you have all the informations you need for debugging. > > if you read the code as you said both of them are link PMC & AIC so you can > not hope to split it as both of the IP contain part of the information > > so no I want the information right where it's Sorry, but that seems like a completely unreasonable requirement, provided that it makes the PM code poke into a completely unrelated IP, just for the sake of one debug message. > > Having the PM driver and the irqchip driver step on each other register > > areas is anyway a bad idea, especially when the only reason to do so is > > for two debugging messages that can be implemented differently. > > > > > Notice that this solution can always be improved later on if needed, > > with further cleanups from you. > > > > But please stop rejecting valid patches from contributors, just because > > the code is not coming from you. What Boris is proposing is perfectly > so If I read you non clean code can come mainline, wow this not the way to > work. If for you do half clean is enough to go mainline. You really need to > change your way of working. Boris patches are far from being half-clean. To me, they look perfectly sane, and are going in the right direction. Again, please stop rejecting contributions from third-parties just because you're not the author of such contributions. It's you who said that they are not clean, but you still haven't given the slightest explanation to justify that. Until a proper justification is given, that points to specific, identifiable, and reasonable problems in the patches, there is absolutely no reason not to consider Boris patches as acceptable (once the header problem is fixed, of course). Best regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 11:22 ` Thomas Petazzoni 2013-05-23 11:58 ` Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-23 13:00 ` Nicolas Ferre 1 sibling, 0 replies; 20+ messages in thread From: Nicolas Ferre @ 2013-05-23 13:00 UTC (permalink / raw) To: linux-arm-kernel On 23/05/2013 13:22, Thomas Petazzoni : > Dear Jean-Christophe PLAGNIOL-VILLARD, [..] > It would be good if the other AT91 maintainers could raise their voice > here, so that Boris knows whether it is worthwhile doing additional > revisions of this patch set. Guys, I do not like the role that I am forced to play... Anyway, Boris I do like the intention of this patch series and be sure that we will integrate it as soon as it is ready. Bye, -- Nicolas Ferre ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 9:05 ` [PATCH 1/3] ARM: at91: move at91 " Boris BREZILLON 2013-05-23 9:06 ` Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-23 10:18 ` Russell King - ARM Linux 2013-05-23 11:59 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-23 12:13 ` Thomas Petazzoni 1 sibling, 2 replies; 20+ messages in thread From: Russell King - ARM Linux @ 2013-05-23 10:18 UTC (permalink / raw) To: linux-arm-kernel On Thu, May 23, 2013 at 11:05:07AM +0200, Boris BREZILLON wrote: > Move arch/arm/mach-at91/irq.c to drivers/irqchip/irq-at91.c. > Move arch/arm/mach-at91/at91_aic.h to > arch/arm/mach-at91/include/mach/at91_aic.h to avoid ugly reference > to header file : > #include "../../arch/arm/mach-at91/at91_aic.h" The right way to do this is to move the definitions which should only be used by arch/arm/mach-at91/irq.c to that file or a header file along side that file, and find a place in include/linux for the remainder. I notice arch/arm/mach-at91/pm.c makes use of some of the register definitions: at91_irq_suspend(); pr_debug("AT91: PM - wake mask %08x, pm state %d\n", /* remember all the always-wake irqs */ (at91_pmc_read(AT91_PMC_PCSR) | (1 << AT91_ID_FIQ) | (1 << AT91_ID_SYS) | (at91_extern_irq)) & at91_aic_read(AT91_AIC_IMR), state); at91_irq_suspend() is in arch/arm/mach-at91/irq.c already, so there's no reason that fragment can't be moved there. That leaves: at91_aic_handle_irq, at91_aic5_handle_irq, NR_AIC_IRQS and NR_AIC5_IRQS, which if you did patch 3 first, would leave you with just the NR_.*_IRQS definitions to find a home for. ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 10:18 ` Russell King - ARM Linux @ 2013-05-23 11:59 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-23 12:13 ` Thomas Petazzoni 1 sibling, 0 replies; 20+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-23 11:59 UTC (permalink / raw) To: linux-arm-kernel On 11:18 Thu 23 May , Russell King - ARM Linux wrote: > On Thu, May 23, 2013 at 11:05:07AM +0200, Boris BREZILLON wrote: > > Move arch/arm/mach-at91/irq.c to drivers/irqchip/irq-at91.c. > > Move arch/arm/mach-at91/at91_aic.h to > > arch/arm/mach-at91/include/mach/at91_aic.h to avoid ugly reference > > to header file : > > #include "../../arch/arm/mach-at91/at91_aic.h" > > The right way to do this is to move the definitions which should only > be used by arch/arm/mach-at91/irq.c to that file or a header file along > side that file, and find a place in include/linux for the remainder. > > I notice arch/arm/mach-at91/pm.c makes use of some of the register > definitions: > > at91_irq_suspend(); > > pr_debug("AT91: PM - wake mask %08x, pm state %d\n", > /* remember all the always-wake irqs */ > (at91_pmc_read(AT91_PMC_PCSR) > | (1 << AT91_ID_FIQ) > | (1 << AT91_ID_SYS) > | (at91_extern_irq)) > & at91_aic_read(AT91_AIC_IMR), > state); > > at91_irq_suspend() is in arch/arm/mach-at91/irq.c already, so there's no > reason that fragment can't be moved there. > > That leaves: at91_aic_handle_irq, at91_aic5_handle_irq, NR_AIC_IRQS and > NR_AIC5_IRQS, which if you did patch 3 first, would leave you with just > the NR_.*_IRQS definitions to find a home for. Boris please update as this Best Regards, J. ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 10:18 ` Russell King - ARM Linux 2013-05-23 11:59 ` Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-23 12:13 ` Thomas Petazzoni 2013-05-23 12:42 ` Boris BREZILLON 2013-05-23 12:44 ` boris brezillon 1 sibling, 2 replies; 20+ messages in thread From: Thomas Petazzoni @ 2013-05-23 12:13 UTC (permalink / raw) To: linux-arm-kernel Dear Russell King - ARM Linux, On Thu, 23 May 2013 11:18:25 +0100, Russell King - ARM Linux wrote: > I notice arch/arm/mach-at91/pm.c makes use of some of the register > definitions: > > at91_irq_suspend(); > > pr_debug("AT91: PM - wake mask %08x, pm state %d\n", > /* remember all the always-wake irqs */ > (at91_pmc_read(AT91_PMC_PCSR) > | (1 << AT91_ID_FIQ) > | (1 << AT91_ID_SYS) > | (at91_extern_irq)) > & at91_aic_read(AT91_AIC_IMR), > state); > > at91_irq_suspend() is in arch/arm/mach-at91/irq.c already, so there's no > reason that fragment can't be moved there. The problem is that the goal of the patch set is to move arch/arm/mach-at91/irq.c into drivers/irqchip/. However, if you move that chunk of code to drivers/irqchip/irq-at91.c, you are using at91_pmc_read() which is defined in arch/arm/mach-at91/include/mach/at91_pmc.h. So, drivers/irqchip/irq-at91.c would have to include such an header file, which is something we want to avoid since drivers/ code should not include something in <mach/...>, as it breaks multiplatform kernels. So, I'm afraid, simply moving this chunk of code in at91_irq_suspend() doesn't make the thing any better. Best regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 12:13 ` Thomas Petazzoni @ 2013-05-23 12:42 ` Boris BREZILLON 2013-05-23 12:44 ` boris brezillon 1 sibling, 0 replies; 20+ messages in thread From: Boris BREZILLON @ 2013-05-23 12:42 UTC (permalink / raw) To: linux-arm-kernel On 23/05/2013 14:13, Thomas Petazzoni wrote: > Dear Russell King - ARM Linux, > > On Thu, 23 May 2013 11:18:25 +0100, Russell King - ARM Linux wrote: > >> I notice arch/arm/mach-at91/pm.c makes use of some of the register >> definitions: >> >> at91_irq_suspend(); >> >> pr_debug("AT91: PM - wake mask %08x, pm state %d\n", >> /* remember all the always-wake irqs */ >> (at91_pmc_read(AT91_PMC_PCSR) >> | (1 << AT91_ID_FIQ) >> | (1 << AT91_ID_SYS) >> | (at91_extern_irq)) >> & at91_aic_read(AT91_AIC_IMR), >> state); >> >> at91_irq_suspend() is in arch/arm/mach-at91/irq.c already, so there's no >> reason that fragment can't be moved there. > > The problem is that the goal of the patch set is to move > arch/arm/mach-at91/irq.c into drivers/irqchip/. > > However, if you move that chunk of code to drivers/irqchip/irq-at91.c, > you are using at91_pmc_read() which is defined in > arch/arm/mach-at91/include/mach/at91_pmc.h. So, > drivers/irqchip/irq-at91.c would have to include such an header file, > which is something we want to avoid since drivers/ code should not > include something in <mach/...>, as it breaks multiplatform kernels. > > So, I'm afraid, simply moving this chunk of code in at91_irq_suspend() > doesn't make the thing any better. > What about keeping the former at91_aic.h in arch/arm/match-at91 and copy the definitions we need in drivers/irqchip/irq-at91.c ? This way we get an aic irqchip driver independant of any specific machine headers and keep the non dt boards and pm drivers without any change. > Best regards, > > Thomas > ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 12:13 ` Thomas Petazzoni 2013-05-23 12:42 ` Boris BREZILLON @ 2013-05-23 12:44 ` boris brezillon 1 sibling, 0 replies; 20+ messages in thread From: boris brezillon @ 2013-05-23 12:44 UTC (permalink / raw) To: linux-arm-kernel On 23/05/2013 14:13, Thomas Petazzoni wrote: > Dear Russell King - ARM Linux, > > On Thu, 23 May 2013 11:18:25 +0100, Russell King - ARM Linux wrote: > >> I notice arch/arm/mach-at91/pm.c makes use of some of the register >> definitions: >> >> at91_irq_suspend(); >> >> pr_debug("AT91: PM - wake mask %08x, pm state %d\n", >> /* remember all the always-wake irqs */ >> (at91_pmc_read(AT91_PMC_PCSR) >> | (1 << AT91_ID_FIQ) >> | (1 << AT91_ID_SYS) >> | (at91_extern_irq)) >> & at91_aic_read(AT91_AIC_IMR), >> state); >> >> at91_irq_suspend() is in arch/arm/mach-at91/irq.c already, so there's no >> reason that fragment can't be moved there. > The problem is that the goal of the patch set is to move > arch/arm/mach-at91/irq.c into drivers/irqchip/. > > However, if you move that chunk of code to drivers/irqchip/irq-at91.c, > you are using at91_pmc_read() which is defined in > arch/arm/mach-at91/include/mach/at91_pmc.h. So, > drivers/irqchip/irq-at91.c would have to include such an header file, > which is something we want to avoid since drivers/ code should not > include something in <mach/...>, as it breaks multiplatform kernels. > > So, I'm afraid, simply moving this chunk of code in at91_irq_suspend() > doesn't make the thing any better. What about keeping the former at91_aic.h in arch/arm/match-at91 and copy the definitions we need in drivers/irqchip/irq-at91.c ? This way we get an aic irqchip driver independant of any specific machine headers and keep the non dt boards and pm drivers without any change. > > Best regards, > > Thomas ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 2/3] ARM: at91: use IRQCHIP_DECLARE instead of machine specific init_irq 2013-05-23 9:05 [RESEND PATCH 0/3] ARM: at91: move aic driver to drivers/irqchip Boris BREZILLON 2013-05-23 9:05 ` [PATCH 1/3] ARM: at91: move at91 " Boris BREZILLON @ 2013-05-23 9:05 ` Boris BREZILLON 2013-05-23 9:05 ` [PATCH 3/3] ARM: at91: use set_handle_irq instead of machine specific handle_irq Boris BREZILLON 2 siblings, 0 replies; 20+ messages in thread From: Boris BREZILLON @ 2013-05-23 9:05 UTC (permalink / raw) To: linux-arm-kernel Replace machine specific init_irq functions with IRQCHIP_DECLARE. Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> --- arch/arm/mach-at91/board-dt-rm9200.c | 11 ----------- arch/arm/mach-at91/board-dt-sam9.c | 12 ------------ arch/arm/mach-at91/board-dt-sama5.c | 12 ------------ arch/arm/mach-at91/generic.h | 5 ----- drivers/irqchip/irq-at91.c | 4 ++++ 5 files changed, 4 insertions(+), 40 deletions(-) diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c index 0c2a06d..523a9ae 100644 --- a/arch/arm/mach-at91/board-dt-rm9200.c +++ b/arch/arm/mach-at91/board-dt-rm9200.c @@ -27,16 +27,6 @@ #include "generic.h" -static const struct of_device_id irq_of_match[] __initconst = { - { .compatible = "atmel,at91rm9200-aic", .data = at91_aic_of_init }, - { /*sentinel*/ } -}; - -static void __init at91rm9200_dt_init_irq(void) -{ - of_irq_init(irq_of_match); -} - static void __init at91rm9200_dt_device_init(void) { of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); @@ -52,7 +42,6 @@ DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)") .map_io = at91_map_io, .handle_irq = at91_aic_handle_irq, .init_early = at91rm9200_dt_initialize, - .init_irq = at91rm9200_dt_init_irq, .init_machine = at91rm9200_dt_device_init, .dt_compat = at91rm9200_dt_board_compat, MACHINE_END diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/board-dt-sam9.c index ac899d8..a07da3b 100644 --- a/arch/arm/mach-at91/board-dt-sam9.c +++ b/arch/arm/mach-at91/board-dt-sam9.c @@ -27,17 +27,6 @@ #include "generic.h" -static const struct of_device_id irq_of_match[] __initconst = { - - { .compatible = "atmel,at91rm9200-aic", .data = at91_aic_of_init }, - { /*sentinel*/ } -}; - -static void __init at91_dt_init_irq(void) -{ - of_irq_init(irq_of_match); -} - static void __init at91_dt_device_init(void) { of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); @@ -54,7 +43,6 @@ DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)") .map_io = at91_map_io, .handle_irq = at91_aic_handle_irq, .init_early = at91_dt_initialize, - .init_irq = at91_dt_init_irq, .init_machine = at91_dt_device_init, .dt_compat = at91_dt_board_compat, MACHINE_END diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c index 43b8f7a..65cf099 100644 --- a/arch/arm/mach-at91/board-dt-sama5.c +++ b/arch/arm/mach-at91/board-dt-sama5.c @@ -28,17 +28,6 @@ #include "generic.h" -static const struct of_device_id irq_of_match[] __initconst = { - - { .compatible = "atmel,sama5d3-aic", .data = at91_aic5_of_init }, - { /*sentinel*/ } -}; - -static void __init at91_dt_init_irq(void) -{ - of_irq_init(irq_of_match); -} - static int ksz9021rn_phy_fixup(struct phy_device *phy) { int value; @@ -81,7 +70,6 @@ DT_MACHINE_START(sama5_dt, "Atmel SAMA5 (Device Tree)") .map_io = at91_map_io, .handle_irq = at91_aic5_handle_irq, .init_early = at91_dt_initialize, - .init_irq = at91_dt_init_irq, .init_machine = sama5_dt_device_init, .dt_compat = sama5_dt_board_compat, MACHINE_END diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index 78ab065..23077cf 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h @@ -29,11 +29,6 @@ extern void __init at91_init_interrupts(unsigned int priority[]); extern void __init at91x40_init_interrupts(unsigned int priority[]); extern void __init at91_aic_init(unsigned int priority[], unsigned int ext_irq_mask); -extern int __init at91_aic_of_init(struct device_node *node, - struct device_node *parent); -extern int __init at91_aic5_of_init(struct device_node *node, - struct device_node *parent); - /* Timer */ extern void at91rm9200_ioremap_st(u32 addr); diff --git a/drivers/irqchip/irq-at91.c b/drivers/irqchip/irq-at91.c index daf2959..b45fe2c 100644 --- a/drivers/irqchip/irq-at91.c +++ b/drivers/irqchip/irq-at91.c @@ -44,6 +44,8 @@ #include <mach/at91_aic.h> +#include "irqchip.h" + void __iomem *at91_aic_base; static struct irq_domain *at91_aic_domain; static struct device_node *at91_aic_np; @@ -471,6 +473,7 @@ int __init at91_aic_of_init(struct device_node *node, return 0; } +IRQCHIP_DECLARE(at91rm9200_aic, "atmel,at91rm9200-aic", at91_aic_of_init); int __init at91_aic5_of_init(struct device_node *node, struct device_node *parent) @@ -493,6 +496,7 @@ int __init at91_aic5_of_init(struct device_node *node, return 0; } +IRQCHIP_DECLARE(sama5d3_aic, "atmel,sama5d3-aic", at91_aic5_of_init); #endif /* -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 3/3] ARM: at91: use set_handle_irq instead of machine specific handle_irq 2013-05-23 9:05 [RESEND PATCH 0/3] ARM: at91: move aic driver to drivers/irqchip Boris BREZILLON 2013-05-23 9:05 ` [PATCH 1/3] ARM: at91: move at91 " Boris BREZILLON 2013-05-23 9:05 ` [PATCH 2/3] ARM: at91: use IRQCHIP_DECLARE instead of machine specific init_irq Boris BREZILLON @ 2013-05-23 9:05 ` Boris BREZILLON 2 siblings, 0 replies; 20+ messages in thread From: Boris BREZILLON @ 2013-05-23 9:05 UTC (permalink / raw) To: linux-arm-kernel Set machine specific irq handler using set_handle_irq inside aic init functions instead of handle_irq pointer from machine_desc. Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> --- arch/arm/mach-at91/board-1arm.c | 1 - arch/arm/mach-at91/board-afeb-9260v1.c | 1 - arch/arm/mach-at91/board-cam60.c | 1 - arch/arm/mach-at91/board-carmeva.c | 1 - arch/arm/mach-at91/board-cpu9krea.c | 1 - arch/arm/mach-at91/board-cpuat91.c | 1 - arch/arm/mach-at91/board-csb337.c | 1 - arch/arm/mach-at91/board-csb637.c | 1 - arch/arm/mach-at91/board-dt-rm9200.c | 1 - arch/arm/mach-at91/board-dt-sam9.c | 1 - arch/arm/mach-at91/board-dt-sama5.c | 1 - arch/arm/mach-at91/board-eb01.c | 1 - arch/arm/mach-at91/board-eb9200.c | 1 - arch/arm/mach-at91/board-ecbat91.c | 1 - arch/arm/mach-at91/board-eco920.c | 1 - arch/arm/mach-at91/board-flexibity.c | 1 - arch/arm/mach-at91/board-foxg20.c | 1 - arch/arm/mach-at91/board-gsia18s.c | 1 - arch/arm/mach-at91/board-kafa.c | 1 - arch/arm/mach-at91/board-kb9202.c | 1 - arch/arm/mach-at91/board-pcontrol-g20.c | 1 - arch/arm/mach-at91/board-picotux200.c | 1 - arch/arm/mach-at91/board-qil-a9260.c | 1 - arch/arm/mach-at91/board-rm9200dk.c | 1 - arch/arm/mach-at91/board-rm9200ek.c | 1 - arch/arm/mach-at91/board-rsi-ews.c | 1 - arch/arm/mach-at91/board-sam9-l9260.c | 1 - arch/arm/mach-at91/board-sam9260ek.c | 1 - arch/arm/mach-at91/board-sam9261ek.c | 1 - arch/arm/mach-at91/board-sam9263ek.c | 1 - arch/arm/mach-at91/board-sam9g20ek.c | 2 -- arch/arm/mach-at91/board-sam9m10g45ek.c | 1 - arch/arm/mach-at91/board-sam9rlek.c | 1 - arch/arm/mach-at91/board-snapper9260.c | 1 - arch/arm/mach-at91/board-stamp9g20.c | 2 -- arch/arm/mach-at91/board-usb-a926x.c | 3 --- arch/arm/mach-at91/board-yl-9200.c | 1 - arch/arm/mach-at91/include/mach/at91_aic.h | 3 --- drivers/irqchip/irq-at91.c | 6 ++++++ 39 files changed, 6 insertions(+), 44 deletions(-) diff --git a/arch/arm/mach-at91/board-1arm.c b/arch/arm/mach-at91/board-1arm.c index 8037dfe..33366d04 100644 --- a/arch/arm/mach-at91/board-1arm.c +++ b/arch/arm/mach-at91/board-1arm.c @@ -92,7 +92,6 @@ MACHINE_START(ONEARM, "Ajeco 1ARM single board computer") /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */ .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = onearm_init_early, .init_irq = at91_init_irq_default, .init_machine = onearm_board_init, diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c index 28bea23..c2026ff 100644 --- a/arch/arm/mach-at91/board-afeb-9260v1.c +++ b/arch/arm/mach-at91/board-afeb-9260v1.c @@ -212,7 +212,6 @@ MACHINE_START(AFEB9260, "Custom afeb9260 board") /* Maintainer: Sergey Lapin <slapin@ossfans.org> */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = afeb9260_init_early, .init_irq = at91_init_irq_default, .init_machine = afeb9260_board_init, diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c index 6ebdf32..64deb3d 100644 --- a/arch/arm/mach-at91/board-cam60.c +++ b/arch/arm/mach-at91/board-cam60.c @@ -189,7 +189,6 @@ MACHINE_START(CAM60, "KwikByte CAM60") /* Maintainer: KwikByte */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = cam60_init_early, .init_irq = at91_init_irq_default, .init_machine = cam60_board_init, diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c index 842db49..6c4a243 100644 --- a/arch/arm/mach-at91/board-carmeva.c +++ b/arch/arm/mach-at91/board-carmeva.c @@ -159,7 +159,6 @@ MACHINE_START(CARMEVA, "Carmeva") /* Maintainer: Conitec Datasystems */ .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = carmeva_init_early, .init_irq = at91_init_irq_default, .init_machine = carmeva_board_init, diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c index 4714e9e..80c5a94 100644 --- a/arch/arm/mach-at91/board-cpu9krea.c +++ b/arch/arm/mach-at91/board-cpu9krea.c @@ -376,7 +376,6 @@ MACHINE_START(CPUAT9G20, "Eukrea CPU9G20") /* Maintainer: Eric Benard - EUKREA Electromatique */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = cpu9krea_init_early, .init_irq = at91_init_irq_default, .init_machine = cpu9krea_board_init, diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c index c1663ed..d91ec57 100644 --- a/arch/arm/mach-at91/board-cpuat91.c +++ b/arch/arm/mach-at91/board-cpuat91.c @@ -180,7 +180,6 @@ MACHINE_START(CPUAT91, "Eukrea") /* Maintainer: Eric Benard - EUKREA Electromatique */ .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = cpuat91_init_early, .init_irq = at91_init_irq_default, .init_machine = cpuat91_board_init, diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c index 3231703..f660331 100644 --- a/arch/arm/mach-at91/board-csb337.c +++ b/arch/arm/mach-at91/board-csb337.c @@ -253,7 +253,6 @@ MACHINE_START(CSB337, "Cogent CSB337") /* Maintainer: Bill Gatliff */ .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = csb337_init_early, .init_irq = at91_init_irq_default, .init_machine = csb337_board_init, diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c index d58c7e6..27ce1ce 100644 --- a/arch/arm/mach-at91/board-csb637.c +++ b/arch/arm/mach-at91/board-csb637.c @@ -134,7 +134,6 @@ MACHINE_START(CSB637, "Cogent CSB637") /* Maintainer: Bill Gatliff */ .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = csb637_init_early, .init_irq = at91_init_irq_default, .init_machine = csb637_board_init, diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c index 523a9ae..72a0658 100644 --- a/arch/arm/mach-at91/board-dt-rm9200.c +++ b/arch/arm/mach-at91/board-dt-rm9200.c @@ -40,7 +40,6 @@ static const char *at91rm9200_dt_board_compat[] __initdata = { DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)") .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = at91rm9200_dt_initialize, .init_machine = at91rm9200_dt_device_init, .dt_compat = at91rm9200_dt_board_compat, diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/board-dt-sam9.c index a07da3b..404a45c 100644 --- a/arch/arm/mach-at91/board-dt-sam9.c +++ b/arch/arm/mach-at91/board-dt-sam9.c @@ -41,7 +41,6 @@ DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)") /* Maintainer: Atmel */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = at91_dt_initialize, .init_machine = at91_dt_device_init, .dt_compat = at91_dt_board_compat, diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c index 65cf099..68619a8 100644 --- a/arch/arm/mach-at91/board-dt-sama5.c +++ b/arch/arm/mach-at91/board-dt-sama5.c @@ -68,7 +68,6 @@ DT_MACHINE_START(sama5_dt, "Atmel SAMA5 (Device Tree)") /* Maintainer: Atmel */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic5_handle_irq, .init_early = at91_dt_initialize, .init_machine = sama5_dt_device_init, .dt_compat = sama5_dt_board_compat, diff --git a/arch/arm/mach-at91/board-eb01.c b/arch/arm/mach-at91/board-eb01.c index 4097ede..6159ba1 100644 --- a/arch/arm/mach-at91/board-eb01.c +++ b/arch/arm/mach-at91/board-eb01.c @@ -46,7 +46,6 @@ static void __init at91eb01_init_early(void) MACHINE_START(AT91EB01, "Atmel AT91 EB01") /* Maintainer: Greg Ungerer <gerg@snapgear.com> */ .init_time = at91x40_timer_init, - .handle_irq = at91_aic_handle_irq, .init_early = at91eb01_init_early, .init_irq = at91eb01_init_irq, MACHINE_END diff --git a/arch/arm/mach-at91/board-eb9200.c b/arch/arm/mach-at91/board-eb9200.c index afa5ebb..f1459c5 100644 --- a/arch/arm/mach-at91/board-eb9200.c +++ b/arch/arm/mach-at91/board-eb9200.c @@ -119,7 +119,6 @@ static void __init eb9200_board_init(void) MACHINE_START(ATEB9200, "Embest ATEB9200") .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = eb9200_init_early, .init_irq = at91_init_irq_default, .init_machine = eb9200_board_init, diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c index c794768..38e4fec 100644 --- a/arch/arm/mach-at91/board-ecbat91.c +++ b/arch/arm/mach-at91/board-ecbat91.c @@ -183,7 +183,6 @@ MACHINE_START(ECBAT91, "emQbit's ECB_AT91") /* Maintainer: emQbit.com */ .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = ecb_at91init_early, .init_irq = at91_init_irq_default, .init_machine = ecb_at91board_init, diff --git a/arch/arm/mach-at91/board-eco920.c b/arch/arm/mach-at91/board-eco920.c index fc3e373..f89904f 100644 --- a/arch/arm/mach-at91/board-eco920.c +++ b/arch/arm/mach-at91/board-eco920.c @@ -151,7 +151,6 @@ MACHINE_START(ECO920, "eco920") /* Maintainer: Sascha Hauer */ .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = eco920_init_early, .init_irq = at91_init_irq_default, .init_machine = eco920_board_init, diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c index 59a1958..090b17a 100644 --- a/arch/arm/mach-at91/board-flexibity.c +++ b/arch/arm/mach-at91/board-flexibity.c @@ -161,7 +161,6 @@ MACHINE_START(FLEXIBITY, "Flexibity Connect") /* Maintainer: Maxim Osipov */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = flexibity_init_early, .init_irq = at91_init_irq_default, .init_machine = flexibity_board_init, diff --git a/arch/arm/mach-at91/board-foxg20.c b/arch/arm/mach-at91/board-foxg20.c index 4b4df05..6c90394 100644 --- a/arch/arm/mach-at91/board-foxg20.c +++ b/arch/arm/mach-at91/board-foxg20.c @@ -264,7 +264,6 @@ MACHINE_START(ACMENETUSFOXG20, "Acme Systems srl FOX Board G20") /* Maintainer: Sergio Tanzilli */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = foxg20_init_early, .init_irq = at91_init_irq_default, .init_machine = foxg20_board_init, diff --git a/arch/arm/mach-at91/board-gsia18s.c b/arch/arm/mach-at91/board-gsia18s.c index 1babcbd..07ebfd3 100644 --- a/arch/arm/mach-at91/board-gsia18s.c +++ b/arch/arm/mach-at91/board-gsia18s.c @@ -576,7 +576,6 @@ static void __init gsia18s_board_init(void) MACHINE_START(GSIA18S, "GS_IA18_S") .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = gsia18s_init_early, .init_irq = at91_init_irq_default, .init_machine = gsia18s_board_init, diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c index aca52d3..82d2113 100644 --- a/arch/arm/mach-at91/board-kafa.c +++ b/arch/arm/mach-at91/board-kafa.c @@ -105,7 +105,6 @@ MACHINE_START(KAFA, "Sperry-Sun KAFA") /* Maintainer: Sergei Sharonov */ .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = kafa_init_early, .init_irq = at91_init_irq_default, .init_machine = kafa_board_init, diff --git a/arch/arm/mach-at91/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c index 7768df0..3a2040f 100644 --- a/arch/arm/mach-at91/board-kb9202.c +++ b/arch/arm/mach-at91/board-kb9202.c @@ -151,7 +151,6 @@ MACHINE_START(KB9200, "KB920x") /* Maintainer: KwikByte, Inc. */ .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = kb9202_init_early, .init_irq = at91_init_irq_default, .init_machine = kb9202_board_init, diff --git a/arch/arm/mach-at91/board-pcontrol-g20.c b/arch/arm/mach-at91/board-pcontrol-g20.c index 6df21db..0df7d60 100644 --- a/arch/arm/mach-at91/board-pcontrol-g20.c +++ b/arch/arm/mach-at91/board-pcontrol-g20.c @@ -219,7 +219,6 @@ MACHINE_START(PCONTROL_G20, "PControl G20") /* Maintainer: pgsellmann at portner-elektronik.at */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = pcontrol_g20_init_early, .init_irq = at91_init_irq_default, .init_machine = pcontrol_g20_board_init, diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c index 566b30c..eada86d 100644 --- a/arch/arm/mach-at91/board-picotux200.c +++ b/arch/arm/mach-at91/board-picotux200.c @@ -121,7 +121,6 @@ MACHINE_START(PICOTUX2XX, "picotux 200") /* Maintainer: Kleinhenz Elektronik GmbH */ .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = picotux200_init_early, .init_irq = at91_init_irq_default, .init_machine = picotux200_board_init, diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c index 0ae5eb1..19096a1 100644 --- a/arch/arm/mach-at91/board-qil-a9260.c +++ b/arch/arm/mach-at91/board-qil-a9260.c @@ -259,7 +259,6 @@ MACHINE_START(QIL_A9260, "CALAO QIL_A9260") /* Maintainer: calao-systems */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = ek_init_early, .init_irq = at91_init_irq_default, .init_machine = ek_board_init, diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c index 82f0335e..30b23cc 100644 --- a/arch/arm/mach-at91/board-rm9200dk.c +++ b/arch/arm/mach-at91/board-rm9200dk.c @@ -221,7 +221,6 @@ MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK") /* Maintainer: SAN People/Atmel */ .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = dk_init_early, .init_irq = at91_init_irq_default, .init_machine = dk_board_init, diff --git a/arch/arm/mach-at91/board-rm9200ek.c b/arch/arm/mach-at91/board-rm9200ek.c index 5e8a4f7..e31b069 100644 --- a/arch/arm/mach-at91/board-rm9200ek.c +++ b/arch/arm/mach-at91/board-rm9200ek.c @@ -188,7 +188,6 @@ MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK") /* Maintainer: SAN People/Atmel */ .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = ek_init_early, .init_irq = at91_init_irq_default, .init_machine = ek_board_init, diff --git a/arch/arm/mach-at91/board-rsi-ews.c b/arch/arm/mach-at91/board-rsi-ews.c index e7d0a69..5fc429b 100644 --- a/arch/arm/mach-at91/board-rsi-ews.c +++ b/arch/arm/mach-at91/board-rsi-ews.c @@ -225,7 +225,6 @@ MACHINE_START(RSI_EWS, "RSI EWS") /* Maintainer: Josef Holzmayr <holzmayr@rsi-elektrotechnik.de> */ .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = rsi_ews_init_early, .init_irq = at91_init_irq_default, .init_machine = rsi_ews_board_init, diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c index 2e400cd..d2e1d70 100644 --- a/arch/arm/mach-at91/board-sam9-l9260.c +++ b/arch/arm/mach-at91/board-sam9-l9260.c @@ -220,7 +220,6 @@ MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260") /* Maintainer: Olimex */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = ek_init_early, .init_irq = at91_init_irq_default, .init_machine = ek_board_init, diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c index 66ee7ac..a7b2e65 100644 --- a/arch/arm/mach-at91/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c @@ -345,7 +345,6 @@ MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK") /* Maintainer: Atmel */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = ek_init_early, .init_irq = at91_init_irq_default, .init_machine = ek_board_init, diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c index 515957e..3971f1d 100644 --- a/arch/arm/mach-at91/board-sam9261ek.c +++ b/arch/arm/mach-at91/board-sam9261ek.c @@ -614,7 +614,6 @@ MACHINE_START(AT91SAM9G10EK, "Atmel AT91SAM9G10-EK") /* Maintainer: Atmel */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = ek_init_early, .init_irq = at91_init_irq_default, .init_machine = ek_board_init, diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c index 1099272..3530eff 100644 --- a/arch/arm/mach-at91/board-sam9263ek.c +++ b/arch/arm/mach-at91/board-sam9263ek.c @@ -445,7 +445,6 @@ MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK") /* Maintainer: Atmel */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = ek_init_early, .init_irq = at91_init_irq_default, .init_machine = ek_board_init, diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index 9fe718b..154f71e 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c @@ -411,7 +411,6 @@ MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK") /* Maintainer: Atmel */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = ek_init_early, .init_irq = at91_init_irq_default, .init_machine = ek_board_init, @@ -421,7 +420,6 @@ MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod") /* Maintainer: Atmel */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = ek_init_early, .init_irq = at91_init_irq_default, .init_machine = ek_board_init, diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c index 1846647..d87ffb5 100644 --- a/arch/arm/mach-at91/board-sam9m10g45ek.c +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c @@ -504,7 +504,6 @@ MACHINE_START(AT91SAM9M10G45EK, "Atmel AT91SAM9M10G45-EK") /* Maintainer: Atmel */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = ek_init_early, .init_irq = at91_init_irq_default, .init_machine = ek_board_init, diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c index 623f2d1..1a0737a 100644 --- a/arch/arm/mach-at91/board-sam9rlek.c +++ b/arch/arm/mach-at91/board-sam9rlek.c @@ -322,7 +322,6 @@ MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK") /* Maintainer: Atmel */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = ek_init_early, .init_irq = at91_init_irq_default, .init_machine = ek_board_init, diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c index 8fef38a..2c1cfeb 100644 --- a/arch/arm/mach-at91/board-snapper9260.c +++ b/arch/arm/mach-at91/board-snapper9260.c @@ -179,7 +179,6 @@ static void __init snapper9260_board_init(void) MACHINE_START(SNAPPER_9260, "Bluewater Systems Snapper 9260/9G20 module") .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = snapper9260_init_early, .init_irq = at91_init_irq_default, .init_machine = snapper9260_board_init, diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c index 6bda942..9ded44b 100644 --- a/arch/arm/mach-at91/board-stamp9g20.c +++ b/arch/arm/mach-at91/board-stamp9g20.c @@ -275,7 +275,6 @@ MACHINE_START(PORTUXG20, "taskit PortuxG20") /* Maintainer: taskit GmbH */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = stamp9g20_init_early, .init_irq = at91_init_irq_default, .init_machine = portuxg20_board_init, @@ -285,7 +284,6 @@ MACHINE_START(STAMP9G20, "taskit Stamp9G20") /* Maintainer: taskit GmbH */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = stamp9g20_init_early, .init_irq = at91_init_irq_default, .init_machine = stamp9g20evb_board_init, diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c index cedbc66..b51978a 100644 --- a/arch/arm/mach-at91/board-usb-a926x.c +++ b/arch/arm/mach-at91/board-usb-a926x.c @@ -357,7 +357,6 @@ MACHINE_START(USB_A9263, "CALAO USB_A9263") /* Maintainer: calao-systems */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = ek_init_early, .init_irq = at91_init_irq_default, .init_machine = ek_board_init, @@ -367,7 +366,6 @@ MACHINE_START(USB_A9260, "CALAO USB_A9260") /* Maintainer: calao-systems */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = ek_init_early, .init_irq = at91_init_irq_default, .init_machine = ek_board_init, @@ -377,7 +375,6 @@ MACHINE_START(USB_A9G20, "CALAO USB_A92G0") /* Maintainer: Jean-Christophe PLAGNIOL-VILLARD */ .init_time = at91sam926x_pit_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = ek_init_early, .init_irq = at91_init_irq_default, .init_machine = ek_board_init, diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c index c61d8c9..874a6b7 100644 --- a/arch/arm/mach-at91/board-yl-9200.c +++ b/arch/arm/mach-at91/board-yl-9200.c @@ -589,7 +589,6 @@ MACHINE_START(YL9200, "uCdragon YL-9200") /* Maintainer: S.Birtles */ .init_time = at91rm9200_timer_init, .map_io = at91_map_io, - .handle_irq = at91_aic_handle_irq, .init_early = yl9200_init_early, .init_irq = at91_init_irq_default, .init_machine = yl9200_board_init, diff --git a/arch/arm/mach-at91/include/mach/at91_aic.h b/arch/arm/mach-at91/include/mach/at91_aic.h index eaea661..be8680d 100644 --- a/arch/arm/mach-at91/include/mach/at91_aic.h +++ b/arch/arm/mach-at91/include/mach/at91_aic.h @@ -93,7 +93,4 @@ extern void __iomem *at91_aic_base; #define AT91_AIC_FFSR 0x148 /* Fast Forcing Status Register [SAM9 only] */ #define AT91_AIC5_FFSR 0x58 /* Fast Forcing Status Register [AIC5] */ -void at91_aic_handle_irq(struct pt_regs *regs); -void at91_aic5_handle_irq(struct pt_regs *regs); - #endif diff --git a/drivers/irqchip/irq-at91.c b/drivers/irqchip/irq-at91.c index b45fe2c..d20053f 100644 --- a/drivers/irqchip/irq-at91.c +++ b/drivers/irqchip/irq-at91.c @@ -471,6 +471,8 @@ int __init at91_aic_of_init(struct device_node *node, at91_aic_hw_init(n_irqs); + set_handle_irq(at91_aic_handle_irq); + return 0; } IRQCHIP_DECLARE(at91rm9200_aic, "atmel,at91rm9200-aic", at91_aic_of_init); @@ -494,6 +496,8 @@ int __init at91_aic5_of_init(struct device_node *node, at91_aic5_hw_init(n_irqs); + set_handle_irq(at91_aic5_handle_irq); + return 0; } IRQCHIP_DECLARE(sama5d3_aic, "atmel,sama5d3-aic", at91_aic5_of_init); @@ -548,4 +552,6 @@ void __init at91_aic_init(unsigned int *priority, unsigned int ext_irq_mask) } at91_aic_hw_init(n_irqs); + + set_handle_irq(at91_aic_handle_irq); } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 0/3] ARM: at91: move aic driver to drivers/irqchip @ 2013-05-23 8:49 Boris BREZILLON 2013-05-23 8:49 ` [PATCH 1/3] ARM: at91: move at91 " Boris BREZILLON 0 siblings, 1 reply; 20+ messages in thread From: Boris BREZILLON @ 2013-05-23 8:49 UTC (permalink / raw) To: linux-arm-kernel Hello, This patch series move the at91 AIC (Advance Interrupt Controller) driver to the irqchip subsystem directory (drivers/irqchip). It also make use of IRQCHIP_DECLARE to register irqchip for dt boards instead of using the machine specific "init_irq" function. Finally it register the arch specific irq handler inside the the init functions using set_handle_irq. This way we can remove all the machine specific "handle_irq". This patch series was tested on kizbox board (sam9g20 SoC) using device tree. Could someone test it on other boards (both dt and non dt)? Best Regards, Boris Boris BREZILLON (3): ARM: at91: move at91 aic driver to drivers/irqchip ARM: at91: use IRQCHIP_DECLARE instead of machine specific init_irq ARM: at91: use set_handle_irq instead of machine specific handle_irq arch/arm/mach-at91/Makefile | 2 +- arch/arm/mach-at91/at91_aic.h | 99 ----- arch/arm/mach-at91/at91rm9200.c | 2 +- arch/arm/mach-at91/at91sam9260.c | 2 +- arch/arm/mach-at91/at91sam9261.c | 2 +- arch/arm/mach-at91/at91sam9263.c | 2 +- arch/arm/mach-at91/at91sam9g45.c | 2 +- arch/arm/mach-at91/at91sam9rl.c | 2 +- arch/arm/mach-at91/at91x40.c | 2 +- arch/arm/mach-at91/board-1arm.c | 3 +- arch/arm/mach-at91/board-afeb-9260v1.c | 3 +- arch/arm/mach-at91/board-cam60.c | 3 +- arch/arm/mach-at91/board-carmeva.c | 3 +- arch/arm/mach-at91/board-cpu9krea.c | 3 +- arch/arm/mach-at91/board-cpuat91.c | 3 +- arch/arm/mach-at91/board-csb337.c | 3 +- arch/arm/mach-at91/board-csb637.c | 3 +- arch/arm/mach-at91/board-dt-rm9200.c | 15 +- arch/arm/mach-at91/board-dt-sam9.c | 16 +- arch/arm/mach-at91/board-dt-sama5.c | 16 +- arch/arm/mach-at91/board-eb01.c | 4 +- arch/arm/mach-at91/board-eb9200.c | 4 +- arch/arm/mach-at91/board-ecbat91.c | 3 +- arch/arm/mach-at91/board-eco920.c | 3 +- arch/arm/mach-at91/board-flexibity.c | 3 +- arch/arm/mach-at91/board-foxg20.c | 3 +- arch/arm/mach-at91/board-gsia18s.c | 3 +- arch/arm/mach-at91/board-kafa.c | 3 +- arch/arm/mach-at91/board-kb9202.c | 3 +- arch/arm/mach-at91/board-pcontrol-g20.c | 3 +- arch/arm/mach-at91/board-picotux200.c | 3 +- arch/arm/mach-at91/board-qil-a9260.c | 3 +- arch/arm/mach-at91/board-rm9200dk.c | 3 +- arch/arm/mach-at91/board-rm9200ek.c | 3 +- arch/arm/mach-at91/board-rsi-ews.c | 4 +- arch/arm/mach-at91/board-sam9-l9260.c | 3 +- arch/arm/mach-at91/board-sam9260ek.c | 3 +- arch/arm/mach-at91/board-sam9261ek.c | 3 +- arch/arm/mach-at91/board-sam9263ek.c | 3 +- arch/arm/mach-at91/board-sam9g20ek.c | 4 +- arch/arm/mach-at91/board-sam9m10g45ek.c | 3 +- arch/arm/mach-at91/board-sam9rlek.c | 3 +- arch/arm/mach-at91/board-snapper9260.c | 3 +- arch/arm/mach-at91/board-stamp9g20.c | 4 +- arch/arm/mach-at91/board-usb-a926x.c | 5 +- arch/arm/mach-at91/board-yl-9200.c | 3 +- arch/arm/mach-at91/generic.h | 5 - arch/arm/mach-at91/include/mach/at91_aic.h | 96 +++++ arch/arm/mach-at91/irq.c | 547 --------------------------- arch/arm/mach-at91/pm.c | 2 +- drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-at91.c | 557 ++++++++++++++++++++++++++++ 52 files changed, 706 insertions(+), 773 deletions(-) delete mode 100644 arch/arm/mach-at91/at91_aic.h create mode 100644 arch/arm/mach-at91/include/mach/at91_aic.h delete mode 100644 arch/arm/mach-at91/irq.c create mode 100644 drivers/irqchip/irq-at91.c -- 1.7.9.5 ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 1/3] ARM: at91: move at91 aic driver to drivers/irqchip 2013-05-23 8:49 [PATCH 0/3] ARM: at91: move aic driver to drivers/irqchip Boris BREZILLON @ 2013-05-23 8:49 ` Boris BREZILLON 0 siblings, 0 replies; 20+ messages in thread From: Boris BREZILLON @ 2013-05-23 8:49 UTC (permalink / raw) To: linux-arm-kernel From: Boris BREZILLON <brezillonboris@gmail.com> Move arch/arm/mach-at91/irq.c to drivers/irqchip/irq-at91.c. Move arch/arm/mach-at91/at91_aic.h to arch/arm/mach-at91/include/mach/at91_aic.h to avoid ugly reference to header file : #include "../../arch/arm/mach-at91/at91_aic.h" Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> --- arch/arm/mach-at91/Makefile | 2 +- arch/arm/mach-at91/at91_aic.h | 99 ----- arch/arm/mach-at91/at91rm9200.c | 2 +- arch/arm/mach-at91/at91sam9260.c | 2 +- arch/arm/mach-at91/at91sam9261.c | 2 +- arch/arm/mach-at91/at91sam9263.c | 2 +- arch/arm/mach-at91/at91sam9g45.c | 2 +- arch/arm/mach-at91/at91sam9rl.c | 2 +- arch/arm/mach-at91/at91x40.c | 2 +- arch/arm/mach-at91/board-1arm.c | 2 +- arch/arm/mach-at91/board-afeb-9260v1.c | 2 +- arch/arm/mach-at91/board-cam60.c | 2 +- arch/arm/mach-at91/board-carmeva.c | 2 +- arch/arm/mach-at91/board-cpu9krea.c | 2 +- arch/arm/mach-at91/board-cpuat91.c | 2 +- arch/arm/mach-at91/board-csb337.c | 2 +- arch/arm/mach-at91/board-csb637.c | 2 +- arch/arm/mach-at91/board-dt-rm9200.c | 3 +- arch/arm/mach-at91/board-dt-sam9.c | 3 +- arch/arm/mach-at91/board-dt-sama5.c | 3 +- arch/arm/mach-at91/board-eb01.c | 3 +- arch/arm/mach-at91/board-eb9200.c | 3 +- arch/arm/mach-at91/board-ecbat91.c | 2 +- arch/arm/mach-at91/board-eco920.c | 2 +- arch/arm/mach-at91/board-flexibity.c | 2 +- arch/arm/mach-at91/board-foxg20.c | 2 +- arch/arm/mach-at91/board-gsia18s.c | 2 +- arch/arm/mach-at91/board-kafa.c | 2 +- arch/arm/mach-at91/board-kb9202.c | 2 +- arch/arm/mach-at91/board-pcontrol-g20.c | 2 +- arch/arm/mach-at91/board-picotux200.c | 2 +- arch/arm/mach-at91/board-qil-a9260.c | 2 +- arch/arm/mach-at91/board-rm9200dk.c | 2 +- arch/arm/mach-at91/board-rm9200ek.c | 2 +- arch/arm/mach-at91/board-rsi-ews.c | 3 +- arch/arm/mach-at91/board-sam9-l9260.c | 2 +- arch/arm/mach-at91/board-sam9260ek.c | 2 +- arch/arm/mach-at91/board-sam9261ek.c | 2 +- arch/arm/mach-at91/board-sam9263ek.c | 2 +- arch/arm/mach-at91/board-sam9g20ek.c | 2 +- arch/arm/mach-at91/board-sam9m10g45ek.c | 2 +- arch/arm/mach-at91/board-sam9rlek.c | 2 +- arch/arm/mach-at91/board-snapper9260.c | 2 +- arch/arm/mach-at91/board-stamp9g20.c | 2 +- arch/arm/mach-at91/board-usb-a926x.c | 2 +- arch/arm/mach-at91/board-yl-9200.c | 2 +- arch/arm/mach-at91/include/mach/at91_aic.h | 99 +++++ arch/arm/mach-at91/irq.c | 547 ---------------------------- arch/arm/mach-at91/pm.c | 2 +- drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-at91.c | 547 ++++++++++++++++++++++++++++ 51 files changed, 699 insertions(+), 692 deletions(-) diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 788562d..5333701 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -2,7 +2,7 @@ # Makefile for the linux kernel. # -obj-y := irq.o gpio.o setup.o +obj-y := gpio.o setup.o obj-m := obj-n := obj- := diff --git a/arch/arm/mach-at91/at91_aic.h b/arch/arm/mach-at91/at91_aic.h deleted file mode 100644 index eaea661..0000000 --- a/arch/arm/mach-at91/at91_aic.h +++ /dev/null @@ -1,99 +0,0 @@ -/* - * arch/arm/mach-at91/include/mach/at91_aic.h - * - * Copyright (C) 2005 Ivan Kokshaysky - * Copyright (C) SAN People - * - * Advanced Interrupt Controller (AIC) - System peripherals registers. - * Based on AT91RM9200 datasheet revision E. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - -#ifndef AT91_AIC_H -#define AT91_AIC_H - -#ifndef __ASSEMBLY__ -extern void __iomem *at91_aic_base; - -#define at91_aic_read(field) \ - __raw_readl(at91_aic_base + field) - -#define at91_aic_write(field, value) \ - __raw_writel(value, at91_aic_base + field) -#else -.extern at91_aic_base -#endif - -/* Number of irq lines managed by AIC */ -#define NR_AIC_IRQS 32 -#define NR_AIC5_IRQS 128 - -#define AT91_AIC5_SSR 0x0 /* Source Select Register [AIC5] */ -#define AT91_AIC5_INTSEL_MSK (0x7f << 0) /* Interrupt Line Selection Mask */ - -#define AT91_AIC_IRQ_MIN_PRIORITY 0 -#define AT91_AIC_IRQ_MAX_PRIORITY 7 - -#define AT91_AIC_SMR(n) ((n) * 4) /* Source Mode Registers 0-31 */ -#define AT91_AIC5_SMR 0x4 /* Source Mode Register [AIC5] */ -#define AT91_AIC_PRIOR (7 << 0) /* Priority Level */ -#define AT91_AIC_SRCTYPE (3 << 5) /* Interrupt Source Type */ -#define AT91_AIC_SRCTYPE_LOW (0 << 5) -#define AT91_AIC_SRCTYPE_FALLING (1 << 5) -#define AT91_AIC_SRCTYPE_HIGH (2 << 5) -#define AT91_AIC_SRCTYPE_RISING (3 << 5) - -#define AT91_AIC_SVR(n) (0x80 + ((n) * 4)) /* Source Vector Registers 0-31 */ -#define AT91_AIC5_SVR 0x8 /* Source Vector Register [AIC5] */ -#define AT91_AIC_IVR 0x100 /* Interrupt Vector Register */ -#define AT91_AIC5_IVR 0x10 /* Interrupt Vector Register [AIC5] */ -#define AT91_AIC_FVR 0x104 /* Fast Interrupt Vector Register */ -#define AT91_AIC5_FVR 0x14 /* Fast Interrupt Vector Register [AIC5] */ -#define AT91_AIC_ISR 0x108 /* Interrupt Status Register */ -#define AT91_AIC5_ISR 0x18 /* Interrupt Status Register [AIC5] */ -#define AT91_AIC_IRQID (0x1f << 0) /* Current Interrupt Identifier */ - -#define AT91_AIC_IPR 0x10c /* Interrupt Pending Register */ -#define AT91_AIC5_IPR0 0x20 /* Interrupt Pending Register 0 [AIC5] */ -#define AT91_AIC5_IPR1 0x24 /* Interrupt Pending Register 1 [AIC5] */ -#define AT91_AIC5_IPR2 0x28 /* Interrupt Pending Register 2 [AIC5] */ -#define AT91_AIC5_IPR3 0x2c /* Interrupt Pending Register 3 [AIC5] */ -#define AT91_AIC_IMR 0x110 /* Interrupt Mask Register */ -#define AT91_AIC5_IMR 0x30 /* Interrupt Mask Register [AIC5] */ -#define AT91_AIC_CISR 0x114 /* Core Interrupt Status Register */ -#define AT91_AIC5_CISR 0x34 /* Core Interrupt Status Register [AIC5] */ -#define AT91_AIC_NFIQ (1 << 0) /* nFIQ Status */ -#define AT91_AIC_NIRQ (1 << 1) /* nIRQ Status */ - -#define AT91_AIC_IECR 0x120 /* Interrupt Enable Command Register */ -#define AT91_AIC5_IECR 0x40 /* Interrupt Enable Command Register [AIC5] */ -#define AT91_AIC_IDCR 0x124 /* Interrupt Disable Command Register */ -#define AT91_AIC5_IDCR 0x44 /* Interrupt Disable Command Register [AIC5] */ -#define AT91_AIC_ICCR 0x128 /* Interrupt Clear Command Register */ -#define AT91_AIC5_ICCR 0x48 /* Interrupt Clear Command Register [AIC5] */ -#define AT91_AIC_ISCR 0x12c /* Interrupt Set Command Register */ -#define AT91_AIC5_ISCR 0x4c /* Interrupt Set Command Register [AIC5] */ -#define AT91_AIC_EOICR 0x130 /* End of Interrupt Command Register */ -#define AT91_AIC5_EOICR 0x38 /* End of Interrupt Command Register [AIC5] */ -#define AT91_AIC_SPU 0x134 /* Spurious Interrupt Vector Register */ -#define AT91_AIC5_SPU 0x3c /* Spurious Interrupt Vector Register [AIC5] */ -#define AT91_AIC_DCR 0x138 /* Debug Control Register */ -#define AT91_AIC5_DCR 0x6c /* Debug Control Register [AIC5] */ -#define AT91_AIC_DCR_PROT (1 << 0) /* Protection Mode */ -#define AT91_AIC_DCR_GMSK (1 << 1) /* General Mask */ - -#define AT91_AIC_FFER 0x140 /* Fast Forcing Enable Register [SAM9 only] */ -#define AT91_AIC5_FFER 0x50 /* Fast Forcing Enable Register [AIC5] */ -#define AT91_AIC_FFDR 0x144 /* Fast Forcing Disable Register [SAM9 only] */ -#define AT91_AIC5_FFDR 0x54 /* Fast Forcing Disable Register [AIC5] */ -#define AT91_AIC_FFSR 0x148 /* Fast Forcing Status Register [SAM9 only] */ -#define AT91_AIC5_FFSR 0x58 /* Fast Forcing Status Register [AIC5] */ - -void at91_aic_handle_irq(struct pt_regs *regs); -void at91_aic5_handle_irq(struct pt_regs *regs); - -#endif diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index d193a40..6c1204a 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -20,8 +20,8 @@ #include <mach/at91_pmc.h> #include <mach/at91_st.h> #include <mach/cpu.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "soc.h" #include "generic.h" #include "clock.h" diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c index a8ce245..55332fa 100644 --- a/arch/arm/mach-at91/at91sam9260.c +++ b/arch/arm/mach-at91/at91sam9260.c @@ -21,8 +21,8 @@ #include <mach/at91_dbgu.h> #include <mach/at91sam9260.h> #include <mach/at91_pmc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_rstc.h" #include "soc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c index 25efb5a..6db61e6 100644 --- a/arch/arm/mach-at91/at91sam9261.c +++ b/arch/arm/mach-at91/at91sam9261.c @@ -20,8 +20,8 @@ #include <mach/cpu.h> #include <mach/at91sam9261.h> #include <mach/at91_pmc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_rstc.h" #include "soc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c index f44ffd2..b9ec043 100644 --- a/arch/arm/mach-at91/at91sam9263.c +++ b/arch/arm/mach-at91/at91sam9263.c @@ -19,8 +19,8 @@ #include <asm/system_misc.h> #include <mach/at91sam9263.h> #include <mach/at91_pmc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_rstc.h" #include "soc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index 8b7fce0..1270707 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c @@ -20,8 +20,8 @@ #include <mach/at91sam9g45.h> #include <mach/at91_pmc.h> #include <mach/cpu.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "soc.h" #include "generic.h" #include "clock.h" diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c index f77fae5..d5f77d6 100644 --- a/arch/arm/mach-at91/at91sam9rl.c +++ b/arch/arm/mach-at91/at91sam9rl.c @@ -20,8 +20,8 @@ #include <mach/at91_dbgu.h> #include <mach/at91sam9rl.h> #include <mach/at91_pmc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_rstc.h" #include "soc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/at91x40.c b/arch/arm/mach-at91/at91x40.c index 19ca793..e8b30fb 100644 --- a/arch/arm/mach-at91/at91x40.c +++ b/arch/arm/mach-at91/at91x40.c @@ -20,8 +20,8 @@ #include <mach/at91x40.h> #include <mach/at91_st.h> #include <mach/timex.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "generic.h" /* diff --git a/arch/arm/mach-at91/board-1arm.c b/arch/arm/mach-at91/board-1arm.c index 35ab632..8037dfe 100644 --- a/arch/arm/mach-at91/board-1arm.c +++ b/arch/arm/mach-at91/board-1arm.c @@ -34,9 +34,9 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> +#include <mach/at91_aic.h> #include <mach/cpu.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c index f95e31c..28bea23 100644 --- a/arch/arm/mach-at91/board-afeb-9260v1.c +++ b/arch/arm/mach-at91/board-afeb-9260v1.c @@ -42,8 +42,8 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/mach/irq.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c index ade948b..6ebdf32 100644 --- a/arch/arm/mach-at91/board-cam60.c +++ b/arch/arm/mach-at91/board-cam60.c @@ -39,8 +39,8 @@ #include <asm/mach/irq.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c index 9298305..842db49 100644 --- a/arch/arm/mach-at91/board-carmeva.c +++ b/arch/arm/mach-at91/board-carmeva.c @@ -35,8 +35,8 @@ #include <asm/mach/irq.h> #include <mach/hardware.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c index 008527e..4714e9e 100644 --- a/arch/arm/mach-at91/board-cpu9krea.c +++ b/arch/arm/mach-at91/board-cpu9krea.c @@ -43,8 +43,8 @@ #include <mach/at91sam9_smc.h> #include <mach/at91sam9260_matrix.h> #include <mach/at91_matrix.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c index 42f1353..c1663ed 100644 --- a/arch/arm/mach-at91/board-cpuat91.c +++ b/arch/arm/mach-at91/board-cpuat91.c @@ -39,8 +39,8 @@ #include <mach/at91rm9200_mc.h> #include <mach/at91_ramc.h> #include <mach/cpu.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c index e5fde215..3231703 100644 --- a/arch/arm/mach-at91/board-csb337.c +++ b/arch/arm/mach-at91/board-csb337.c @@ -38,8 +38,8 @@ #include <asm/mach/irq.h> #include <mach/hardware.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c index fdf1106..d58c7e6 100644 --- a/arch/arm/mach-at91/board-csb637.c +++ b/arch/arm/mach-at91/board-csb637.c @@ -35,8 +35,8 @@ #include <asm/mach/irq.h> #include <mach/hardware.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c index 3fcb662..0c2a06d 100644 --- a/arch/arm/mach-at91/board-dt-rm9200.c +++ b/arch/arm/mach-at91/board-dt-rm9200.c @@ -22,7 +22,8 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include "at91_aic.h" +#include <mach/at91_aic.h> + #include "generic.h" diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/board-dt-sam9.c index 8db3013..ac899d8 100644 --- a/arch/arm/mach-at91/board-dt-sam9.c +++ b/arch/arm/mach-at91/board-dt-sam9.c @@ -21,7 +21,8 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include "at91_aic.h" +#include <mach/at91_aic.h> + #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c index 705305e..43b8f7a 100644 --- a/arch/arm/mach-at91/board-dt-sama5.c +++ b/arch/arm/mach-at91/board-dt-sama5.c @@ -23,7 +23,8 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include "at91_aic.h" +#include <mach/at91_aic.h> + #include "generic.h" diff --git a/arch/arm/mach-at91/board-eb01.c b/arch/arm/mach-at91/board-eb01.c index becf0a6..4097ede 100644 --- a/arch/arm/mach-at91/board-eb01.c +++ b/arch/arm/mach-at91/board-eb01.c @@ -28,7 +28,8 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include "at91_aic.h" +#include <mach/at91_aic.h> + #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-eb9200.c b/arch/arm/mach-at91/board-eb9200.c index f9be816..afa5ebb 100644 --- a/arch/arm/mach-at91/board-eb9200.c +++ b/arch/arm/mach-at91/board-eb9200.c @@ -35,7 +35,8 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include "at91_aic.h" +#include <mach/at91_aic.h> + #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c index b2fcd71..c794768 100644 --- a/arch/arm/mach-at91/board-ecbat91.c +++ b/arch/arm/mach-at91/board-ecbat91.c @@ -38,8 +38,8 @@ #include <asm/mach/irq.h> #include <mach/cpu.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-eco920.c b/arch/arm/mach-at91/board-eco920.c index 77de410..fc3e373 100644 --- a/arch/arm/mach-at91/board-eco920.c +++ b/arch/arm/mach-at91/board-eco920.c @@ -27,8 +27,8 @@ #include <mach/at91rm9200_mc.h> #include <mach/at91_ramc.h> #include <mach/cpu.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c index 737c085..59a1958 100644 --- a/arch/arm/mach-at91/board-flexibity.c +++ b/arch/arm/mach-at91/board-flexibity.c @@ -33,8 +33,8 @@ #include <asm/mach/irq.h> #include <mach/hardware.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-foxg20.c b/arch/arm/mach-at91/board-foxg20.c index c20a870..4b4df05 100644 --- a/arch/arm/mach-at91/board-foxg20.c +++ b/arch/arm/mach-at91/board-foxg20.c @@ -42,8 +42,8 @@ #include <asm/mach/irq.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-gsia18s.c b/arch/arm/mach-at91/board-gsia18s.c index c1d61d2..1babcbd 100644 --- a/arch/arm/mach-at91/board-gsia18s.c +++ b/arch/arm/mach-at91/board-gsia18s.c @@ -31,8 +31,8 @@ #include <asm/mach/arch.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c index 88e2f5d..aca52d3 100644 --- a/arch/arm/mach-at91/board-kafa.c +++ b/arch/arm/mach-at91/board-kafa.c @@ -35,8 +35,8 @@ #include <asm/mach/irq.h> #include <mach/cpu.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c index 0c519d9..7768df0 100644 --- a/arch/arm/mach-at91/board-kb9202.c +++ b/arch/arm/mach-at91/board-kb9202.c @@ -38,8 +38,8 @@ #include <mach/cpu.h> #include <mach/at91rm9200_mc.h> #include <mach/at91_ramc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-pcontrol-g20.c b/arch/arm/mach-at91/board-pcontrol-g20.c index 65c0d6b..6df21db 100644 --- a/arch/arm/mach-at91/board-pcontrol-g20.c +++ b/arch/arm/mach-at91/board-pcontrol-g20.c @@ -30,8 +30,8 @@ #include <asm/mach/arch.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c index ab2b2ec..566b30c 100644 --- a/arch/arm/mach-at91/board-picotux200.c +++ b/arch/arm/mach-at91/board-picotux200.c @@ -39,8 +39,8 @@ #include <mach/at91rm9200_mc.h> #include <mach/at91_ramc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c index aa3bc9b..0ae5eb1 100644 --- a/arch/arm/mach-at91/board-qil-a9260.c +++ b/arch/arm/mach-at91/board-qil-a9260.c @@ -41,8 +41,8 @@ #include <mach/hardware.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c index 690541b..82f0335e 100644 --- a/arch/arm/mach-at91/board-rm9200dk.c +++ b/arch/arm/mach-at91/board-rm9200dk.c @@ -41,8 +41,8 @@ #include <mach/hardware.h> #include <mach/at91rm9200_mc.h> #include <mach/at91_ramc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-rm9200ek.c b/arch/arm/mach-at91/board-rm9200ek.c index 8b17dad..5e8a4f7 100644 --- a/arch/arm/mach-at91/board-rm9200ek.c +++ b/arch/arm/mach-at91/board-rm9200ek.c @@ -41,8 +41,8 @@ #include <mach/hardware.h> #include <mach/at91rm9200_mc.h> #include <mach/at91_ramc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-rsi-ews.c b/arch/arm/mach-at91/board-rsi-ews.c index f6d7f19..e7d0a69 100644 --- a/arch/arm/mach-at91/board-rsi-ews.c +++ b/arch/arm/mach-at91/board-rsi-ews.c @@ -28,7 +28,8 @@ #include <linux/gpio.h> -#include "at91_aic.h" +#include <mach/at91_aic.h> + #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c index 43ee4dc..2e400cd 100644 --- a/arch/arm/mach-at91/board-sam9-l9260.c +++ b/arch/arm/mach-at91/board-sam9-l9260.c @@ -38,8 +38,8 @@ #include <asm/mach/irq.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c index 0b153c8..66ee7ac 100644 --- a/arch/arm/mach-at91/board-sam9260ek.c +++ b/arch/arm/mach-at91/board-sam9260ek.c @@ -43,8 +43,8 @@ #include <mach/hardware.h> #include <mach/at91sam9_smc.h> #include <mach/system_rev.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c index b446645..515957e 100644 --- a/arch/arm/mach-at91/board-sam9261ek.c +++ b/arch/arm/mach-at91/board-sam9261ek.c @@ -47,8 +47,8 @@ #include <mach/hardware.h> #include <mach/at91sam9_smc.h> #include <mach/system_rev.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c index 3284df0..1099272 100644 --- a/arch/arm/mach-at91/board-sam9263ek.c +++ b/arch/arm/mach-at91/board-sam9263ek.c @@ -46,8 +46,8 @@ #include <mach/hardware.h> #include <mach/at91sam9_smc.h> #include <mach/system_rev.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index f9cd1f2..9fe718b 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c @@ -45,8 +45,8 @@ #include <mach/at91sam9_smc.h> #include <mach/system_rev.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c index 2a94896..1846647 100644 --- a/arch/arm/mach-at91/board-sam9m10g45ek.c +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c @@ -44,8 +44,8 @@ #include <mach/at91sam9_smc.h> #include <mach/system_rev.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c index aa265dc..623f2d1 100644 --- a/arch/arm/mach-at91/board-sam9rlek.c +++ b/arch/arm/mach-at91/board-sam9rlek.c @@ -31,9 +31,9 @@ #include <mach/hardware.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c index 3aaa978..8fef38a 100644 --- a/arch/arm/mach-at91/board-snapper9260.c +++ b/arch/arm/mach-at91/board-snapper9260.c @@ -33,8 +33,8 @@ #include <mach/hardware.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c index 869cbec..6bda942 100644 --- a/arch/arm/mach-at91/board-stamp9g20.c +++ b/arch/arm/mach-at91/board-stamp9g20.c @@ -26,8 +26,8 @@ #include <asm/mach/arch.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "sam9_smc.h" #include "generic.h" diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c index 2487d94..cedbc66 100644 --- a/arch/arm/mach-at91/board-usb-a926x.c +++ b/arch/arm/mach-at91/board-usb-a926x.c @@ -42,8 +42,8 @@ #include <mach/hardware.h> #include <mach/at91sam9_smc.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "at91_shdwc.h" #include "board.h" #include "sam9_smc.h" diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c index be08377..c61d8c9 100644 --- a/arch/arm/mach-at91/board-yl-9200.c +++ b/arch/arm/mach-at91/board-yl-9200.c @@ -46,8 +46,8 @@ #include <mach/at91rm9200_mc.h> #include <mach/at91_ramc.h> #include <mach/cpu.h> +#include <mach/at91_aic.h> -#include "at91_aic.h" #include "board.h" #include "generic.h" diff --git a/arch/arm/mach-at91/include/mach/at91_aic.h b/arch/arm/mach-at91/include/mach/at91_aic.h new file mode 100644 index 0000000..eaea661 --- /dev/null +++ b/arch/arm/mach-at91/include/mach/at91_aic.h @@ -0,0 +1,99 @@ +/* + * arch/arm/mach-at91/include/mach/at91_aic.h + * + * Copyright (C) 2005 Ivan Kokshaysky + * Copyright (C) SAN People + * + * Advanced Interrupt Controller (AIC) - System peripherals registers. + * Based on AT91RM9200 datasheet revision E. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#ifndef AT91_AIC_H +#define AT91_AIC_H + +#ifndef __ASSEMBLY__ +extern void __iomem *at91_aic_base; + +#define at91_aic_read(field) \ + __raw_readl(at91_aic_base + field) + +#define at91_aic_write(field, value) \ + __raw_writel(value, at91_aic_base + field) +#else +.extern at91_aic_base +#endif + +/* Number of irq lines managed by AIC */ +#define NR_AIC_IRQS 32 +#define NR_AIC5_IRQS 128 + +#define AT91_AIC5_SSR 0x0 /* Source Select Register [AIC5] */ +#define AT91_AIC5_INTSEL_MSK (0x7f << 0) /* Interrupt Line Selection Mask */ + +#define AT91_AIC_IRQ_MIN_PRIORITY 0 +#define AT91_AIC_IRQ_MAX_PRIORITY 7 + +#define AT91_AIC_SMR(n) ((n) * 4) /* Source Mode Registers 0-31 */ +#define AT91_AIC5_SMR 0x4 /* Source Mode Register [AIC5] */ +#define AT91_AIC_PRIOR (7 << 0) /* Priority Level */ +#define AT91_AIC_SRCTYPE (3 << 5) /* Interrupt Source Type */ +#define AT91_AIC_SRCTYPE_LOW (0 << 5) +#define AT91_AIC_SRCTYPE_FALLING (1 << 5) +#define AT91_AIC_SRCTYPE_HIGH (2 << 5) +#define AT91_AIC_SRCTYPE_RISING (3 << 5) + +#define AT91_AIC_SVR(n) (0x80 + ((n) * 4)) /* Source Vector Registers 0-31 */ +#define AT91_AIC5_SVR 0x8 /* Source Vector Register [AIC5] */ +#define AT91_AIC_IVR 0x100 /* Interrupt Vector Register */ +#define AT91_AIC5_IVR 0x10 /* Interrupt Vector Register [AIC5] */ +#define AT91_AIC_FVR 0x104 /* Fast Interrupt Vector Register */ +#define AT91_AIC5_FVR 0x14 /* Fast Interrupt Vector Register [AIC5] */ +#define AT91_AIC_ISR 0x108 /* Interrupt Status Register */ +#define AT91_AIC5_ISR 0x18 /* Interrupt Status Register [AIC5] */ +#define AT91_AIC_IRQID (0x1f << 0) /* Current Interrupt Identifier */ + +#define AT91_AIC_IPR 0x10c /* Interrupt Pending Register */ +#define AT91_AIC5_IPR0 0x20 /* Interrupt Pending Register 0 [AIC5] */ +#define AT91_AIC5_IPR1 0x24 /* Interrupt Pending Register 1 [AIC5] */ +#define AT91_AIC5_IPR2 0x28 /* Interrupt Pending Register 2 [AIC5] */ +#define AT91_AIC5_IPR3 0x2c /* Interrupt Pending Register 3 [AIC5] */ +#define AT91_AIC_IMR 0x110 /* Interrupt Mask Register */ +#define AT91_AIC5_IMR 0x30 /* Interrupt Mask Register [AIC5] */ +#define AT91_AIC_CISR 0x114 /* Core Interrupt Status Register */ +#define AT91_AIC5_CISR 0x34 /* Core Interrupt Status Register [AIC5] */ +#define AT91_AIC_NFIQ (1 << 0) /* nFIQ Status */ +#define AT91_AIC_NIRQ (1 << 1) /* nIRQ Status */ + +#define AT91_AIC_IECR 0x120 /* Interrupt Enable Command Register */ +#define AT91_AIC5_IECR 0x40 /* Interrupt Enable Command Register [AIC5] */ +#define AT91_AIC_IDCR 0x124 /* Interrupt Disable Command Register */ +#define AT91_AIC5_IDCR 0x44 /* Interrupt Disable Command Register [AIC5] */ +#define AT91_AIC_ICCR 0x128 /* Interrupt Clear Command Register */ +#define AT91_AIC5_ICCR 0x48 /* Interrupt Clear Command Register [AIC5] */ +#define AT91_AIC_ISCR 0x12c /* Interrupt Set Command Register */ +#define AT91_AIC5_ISCR 0x4c /* Interrupt Set Command Register [AIC5] */ +#define AT91_AIC_EOICR 0x130 /* End of Interrupt Command Register */ +#define AT91_AIC5_EOICR 0x38 /* End of Interrupt Command Register [AIC5] */ +#define AT91_AIC_SPU 0x134 /* Spurious Interrupt Vector Register */ +#define AT91_AIC5_SPU 0x3c /* Spurious Interrupt Vector Register [AIC5] */ +#define AT91_AIC_DCR 0x138 /* Debug Control Register */ +#define AT91_AIC5_DCR 0x6c /* Debug Control Register [AIC5] */ +#define AT91_AIC_DCR_PROT (1 << 0) /* Protection Mode */ +#define AT91_AIC_DCR_GMSK (1 << 1) /* General Mask */ + +#define AT91_AIC_FFER 0x140 /* Fast Forcing Enable Register [SAM9 only] */ +#define AT91_AIC5_FFER 0x50 /* Fast Forcing Enable Register [AIC5] */ +#define AT91_AIC_FFDR 0x144 /* Fast Forcing Disable Register [SAM9 only] */ +#define AT91_AIC5_FFDR 0x54 /* Fast Forcing Disable Register [AIC5] */ +#define AT91_AIC_FFSR 0x148 /* Fast Forcing Status Register [SAM9 only] */ +#define AT91_AIC5_FFSR 0x58 /* Fast Forcing Status Register [AIC5] */ + +void at91_aic_handle_irq(struct pt_regs *regs); +void at91_aic5_handle_irq(struct pt_regs *regs); + +#endif diff --git a/arch/arm/mach-at91/irq.c b/arch/arm/mach-at91/irq.c deleted file mode 100644 index e0ca591..0000000 --- a/arch/arm/mach-at91/irq.c +++ /dev/null @@ -1,547 +0,0 @@ -/* - * linux/arch/arm/mach-at91/irq.c - * - * Copyright (C) 2004 SAN People - * Copyright (C) 2004 ATMEL - * Copyright (C) Rick Bronson - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <linux/init.h> -#include <linux/module.h> -#include <linux/mm.h> -#include <linux/bitmap.h> -#include <linux/types.h> -#include <linux/irq.h> -#include <linux/of.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> -#include <linux/irqdomain.h> -#include <linux/err.h> -#include <linux/slab.h> - -#include <mach/hardware.h> -#include <asm/irq.h> -#include <asm/setup.h> - -#include <asm/exception.h> -#include <asm/mach/arch.h> -#include <asm/mach/irq.h> -#include <asm/mach/map.h> - -#include "at91_aic.h" - -void __iomem *at91_aic_base; -static struct irq_domain *at91_aic_domain; -static struct device_node *at91_aic_np; -static unsigned int n_irqs = NR_AIC_IRQS; -static unsigned long at91_aic_caps = 0; - -/* AIC5 introduces a Source Select Register */ -#define AT91_AIC_CAP_AIC5 (1 << 0) -#define has_aic5() (at91_aic_caps & AT91_AIC_CAP_AIC5) - -#ifdef CONFIG_PM - -static unsigned long *wakeups; -static unsigned long *backups; - -#define set_backup(bit) set_bit(bit, backups) -#define clear_backup(bit) clear_bit(bit, backups) - -static int at91_aic_pm_init(void) -{ - backups = kzalloc(BITS_TO_LONGS(n_irqs) * sizeof(*backups), GFP_KERNEL); - if (!backups) - return -ENOMEM; - - wakeups = kzalloc(BITS_TO_LONGS(n_irqs) * sizeof(*backups), GFP_KERNEL); - if (!wakeups) { - kfree(backups); - return -ENOMEM; - } - - return 0; -} - -static int at91_aic_set_wake(struct irq_data *d, unsigned value) -{ - if (unlikely(d->hwirq >= n_irqs)) - return -EINVAL; - - if (value) - set_bit(d->hwirq, wakeups); - else - clear_bit(d->hwirq, wakeups); - - return 0; -} - -void at91_irq_suspend(void) -{ - int bit = -1; - - if (has_aic5()) { - /* disable enabled irqs */ - while ((bit = find_next_bit(backups, n_irqs, bit + 1)) < n_irqs) { - at91_aic_write(AT91_AIC5_SSR, - bit & AT91_AIC5_INTSEL_MSK); - at91_aic_write(AT91_AIC5_IDCR, 1); - } - /* enable wakeup irqs */ - bit = -1; - while ((bit = find_next_bit(wakeups, n_irqs, bit + 1)) < n_irqs) { - at91_aic_write(AT91_AIC5_SSR, - bit & AT91_AIC5_INTSEL_MSK); - at91_aic_write(AT91_AIC5_IECR, 1); - } - } else { - at91_aic_write(AT91_AIC_IDCR, *backups); - at91_aic_write(AT91_AIC_IECR, *wakeups); - } -} - -void at91_irq_resume(void) -{ - int bit = -1; - - if (has_aic5()) { - /* disable wakeup irqs */ - while ((bit = find_next_bit(wakeups, n_irqs, bit + 1)) < n_irqs) { - at91_aic_write(AT91_AIC5_SSR, - bit & AT91_AIC5_INTSEL_MSK); - at91_aic_write(AT91_AIC5_IDCR, 1); - } - /* enable irqs disabled for suspend */ - bit = -1; - while ((bit = find_next_bit(backups, n_irqs, bit + 1)) < n_irqs) { - at91_aic_write(AT91_AIC5_SSR, - bit & AT91_AIC5_INTSEL_MSK); - at91_aic_write(AT91_AIC5_IECR, 1); - } - } else { - at91_aic_write(AT91_AIC_IDCR, *wakeups); - at91_aic_write(AT91_AIC_IECR, *backups); - } -} - -#else -static inline int at91_aic_pm_init(void) -{ - return 0; -} - -#define set_backup(bit) -#define clear_backup(bit) -#define at91_aic_set_wake NULL - -#endif /* CONFIG_PM */ - -asmlinkage void __exception_irq_entry -at91_aic_handle_irq(struct pt_regs *regs) -{ - u32 irqnr; - u32 irqstat; - - irqnr = at91_aic_read(AT91_AIC_IVR); - irqstat = at91_aic_read(AT91_AIC_ISR); - - /* - * ISR value is 0 when there is no current interrupt or when there is - * a spurious interrupt - */ - if (!irqstat) - at91_aic_write(AT91_AIC_EOICR, 0); - else - handle_IRQ(irqnr, regs); -} - -asmlinkage void __exception_irq_entry -at91_aic5_handle_irq(struct pt_regs *regs) -{ - u32 irqnr; - u32 irqstat; - - irqnr = at91_aic_read(AT91_AIC5_IVR); - irqstat = at91_aic_read(AT91_AIC5_ISR); - - if (!irqstat) - at91_aic_write(AT91_AIC5_EOICR, 0); - else - handle_IRQ(irqnr, regs); -} - -static void at91_aic_mask_irq(struct irq_data *d) -{ - /* Disable interrupt on AIC */ - at91_aic_write(AT91_AIC_IDCR, 1 << d->hwirq); - /* Update ISR cache */ - clear_backup(d->hwirq); -} - -static void __maybe_unused at91_aic5_mask_irq(struct irq_data *d) -{ - /* Disable interrupt on AIC5 */ - at91_aic_write(AT91_AIC5_SSR, d->hwirq & AT91_AIC5_INTSEL_MSK); - at91_aic_write(AT91_AIC5_IDCR, 1); - /* Update ISR cache */ - clear_backup(d->hwirq); -} - -static void at91_aic_unmask_irq(struct irq_data *d) -{ - /* Enable interrupt on AIC */ - at91_aic_write(AT91_AIC_IECR, 1 << d->hwirq); - /* Update ISR cache */ - set_backup(d->hwirq); -} - -static void __maybe_unused at91_aic5_unmask_irq(struct irq_data *d) -{ - /* Enable interrupt on AIC5 */ - at91_aic_write(AT91_AIC5_SSR, d->hwirq & AT91_AIC5_INTSEL_MSK); - at91_aic_write(AT91_AIC5_IECR, 1); - /* Update ISR cache */ - set_backup(d->hwirq); -} - -static void at91_aic_eoi(struct irq_data *d) -{ - /* - * Mark end-of-interrupt on AIC, the controller doesn't care about - * the value written. Moreover it's a write-only register. - */ - at91_aic_write(AT91_AIC_EOICR, 0); -} - -static void __maybe_unused at91_aic5_eoi(struct irq_data *d) -{ - at91_aic_write(AT91_AIC5_EOICR, 0); -} - -unsigned long *at91_extern_irq; - -#define is_extern_irq(hwirq) test_bit(hwirq, at91_extern_irq) - -static int at91_aic_compute_srctype(struct irq_data *d, unsigned type) -{ - int srctype; - - switch (type) { - case IRQ_TYPE_LEVEL_HIGH: - srctype = AT91_AIC_SRCTYPE_HIGH; - break; - case IRQ_TYPE_EDGE_RISING: - srctype = AT91_AIC_SRCTYPE_RISING; - break; - case IRQ_TYPE_LEVEL_LOW: - if ((d->hwirq == AT91_ID_FIQ) || is_extern_irq(d->hwirq)) /* only supported on external interrupts */ - srctype = AT91_AIC_SRCTYPE_LOW; - else - srctype = -EINVAL; - break; - case IRQ_TYPE_EDGE_FALLING: - if ((d->hwirq == AT91_ID_FIQ) || is_extern_irq(d->hwirq)) /* only supported on external interrupts */ - srctype = AT91_AIC_SRCTYPE_FALLING; - else - srctype = -EINVAL; - break; - default: - srctype = -EINVAL; - } - - return srctype; -} - -static int at91_aic_set_type(struct irq_data *d, unsigned type) -{ - unsigned int smr; - int srctype; - - srctype = at91_aic_compute_srctype(d, type); - if (srctype < 0) - return srctype; - - if (has_aic5()) { - at91_aic_write(AT91_AIC5_SSR, - d->hwirq & AT91_AIC5_INTSEL_MSK); - smr = at91_aic_read(AT91_AIC5_SMR) & ~AT91_AIC_SRCTYPE; - at91_aic_write(AT91_AIC5_SMR, smr | srctype); - } else { - smr = at91_aic_read(AT91_AIC_SMR(d->hwirq)) - & ~AT91_AIC_SRCTYPE; - at91_aic_write(AT91_AIC_SMR(d->hwirq), smr | srctype); - } - - return 0; -} - -static struct irq_chip at91_aic_chip = { - .name = "AIC", - .irq_mask = at91_aic_mask_irq, - .irq_unmask = at91_aic_unmask_irq, - .irq_set_type = at91_aic_set_type, - .irq_set_wake = at91_aic_set_wake, - .irq_eoi = at91_aic_eoi, -}; - -static void __init at91_aic_hw_init(unsigned int spu_vector) -{ - int i; - - /* - * Perform 8 End Of Interrupt Command to make sure AIC - * will not Lock out nIRQ - */ - for (i = 0; i < 8; i++) - at91_aic_write(AT91_AIC_EOICR, 0); - - /* - * Spurious Interrupt ID in Spurious Vector Register. - * When there is no current interrupt, the IRQ Vector Register - * reads the value stored in AIC_SPU - */ - at91_aic_write(AT91_AIC_SPU, spu_vector); - - /* No debugging in AIC: Debug (Protect) Control Register */ - at91_aic_write(AT91_AIC_DCR, 0); - - /* Disable and clear all interrupts initially */ - at91_aic_write(AT91_AIC_IDCR, 0xFFFFFFFF); - at91_aic_write(AT91_AIC_ICCR, 0xFFFFFFFF); -} - -static void __init __maybe_unused at91_aic5_hw_init(unsigned int spu_vector) -{ - int i; - - /* - * Perform 8 End Of Interrupt Command to make sure AIC - * will not Lock out nIRQ - */ - for (i = 0; i < 8; i++) - at91_aic_write(AT91_AIC5_EOICR, 0); - - /* - * Spurious Interrupt ID in Spurious Vector Register. - * When there is no current interrupt, the IRQ Vector Register - * reads the value stored in AIC_SPU - */ - at91_aic_write(AT91_AIC5_SPU, spu_vector); - - /* No debugging in AIC: Debug (Protect) Control Register */ - at91_aic_write(AT91_AIC5_DCR, 0); - - /* Disable and clear all interrupts initially */ - for (i = 0; i < n_irqs; i++) { - at91_aic_write(AT91_AIC5_SSR, i & AT91_AIC5_INTSEL_MSK); - at91_aic_write(AT91_AIC5_IDCR, 1); - at91_aic_write(AT91_AIC5_ICCR, 1); - } -} - -#if defined(CONFIG_OF) -static unsigned int *at91_aic_irq_priorities; - -static int at91_aic_irq_map(struct irq_domain *h, unsigned int virq, - irq_hw_number_t hw) -{ - /* Put virq number in Source Vector Register */ - at91_aic_write(AT91_AIC_SVR(hw), virq); - - /* Active Low interrupt, with priority */ - at91_aic_write(AT91_AIC_SMR(hw), - AT91_AIC_SRCTYPE_LOW | at91_aic_irq_priorities[hw]); - - irq_set_chip_and_handler(virq, &at91_aic_chip, handle_fasteoi_irq); - set_irq_flags(virq, IRQF_VALID | IRQF_PROBE); - - return 0; -} - -static int at91_aic5_irq_map(struct irq_domain *h, unsigned int virq, - irq_hw_number_t hw) -{ - at91_aic_write(AT91_AIC5_SSR, hw & AT91_AIC5_INTSEL_MSK); - - /* Put virq number in Source Vector Register */ - at91_aic_write(AT91_AIC5_SVR, virq); - - /* Active Low interrupt, with priority */ - at91_aic_write(AT91_AIC5_SMR, - AT91_AIC_SRCTYPE_LOW | at91_aic_irq_priorities[hw]); - - irq_set_chip_and_handler(virq, &at91_aic_chip, handle_fasteoi_irq); - set_irq_flags(virq, IRQF_VALID | IRQF_PROBE); - - return 0; -} - -static int at91_aic_irq_domain_xlate(struct irq_domain *d, struct device_node *ctrlr, - const u32 *intspec, unsigned int intsize, - irq_hw_number_t *out_hwirq, unsigned int *out_type) -{ - if (WARN_ON(intsize < 3)) - return -EINVAL; - if (WARN_ON(intspec[0] >= n_irqs)) - return -EINVAL; - if (WARN_ON((intspec[2] < AT91_AIC_IRQ_MIN_PRIORITY) - || (intspec[2] > AT91_AIC_IRQ_MAX_PRIORITY))) - return -EINVAL; - - *out_hwirq = intspec[0]; - *out_type = intspec[1] & IRQ_TYPE_SENSE_MASK; - at91_aic_irq_priorities[*out_hwirq] = intspec[2]; - - return 0; -} - -static struct irq_domain_ops at91_aic_irq_ops = { - .map = at91_aic_irq_map, - .xlate = at91_aic_irq_domain_xlate, -}; - -int __init at91_aic_of_common_init(struct device_node *node, - struct device_node *parent) -{ - struct property *prop; - const __be32 *p; - u32 val; - - at91_extern_irq = kzalloc(BITS_TO_LONGS(n_irqs) - * sizeof(*at91_extern_irq), GFP_KERNEL); - if (!at91_extern_irq) - return -ENOMEM; - - if (at91_aic_pm_init()) { - kfree(at91_extern_irq); - return -ENOMEM; - } - - at91_aic_irq_priorities = kzalloc(n_irqs - * sizeof(*at91_aic_irq_priorities), - GFP_KERNEL); - if (!at91_aic_irq_priorities) - return -ENOMEM; - - at91_aic_base = of_iomap(node, 0); - at91_aic_np = node; - - at91_aic_domain = irq_domain_add_linear(at91_aic_np, n_irqs, - &at91_aic_irq_ops, NULL); - if (!at91_aic_domain) - panic("Unable to add AIC irq domain (DT)\n"); - - of_property_for_each_u32(node, "atmel,external-irqs", prop, p, val) { - if (val >= n_irqs) - pr_warn("AIC: external irq %d >= %d skip it\n", - val, n_irqs); - else - set_bit(val, at91_extern_irq); - } - - irq_set_default_host(at91_aic_domain); - - return 0; -} - -int __init at91_aic_of_init(struct device_node *node, - struct device_node *parent) -{ - int err; - - err = at91_aic_of_common_init(node, parent); - if (err) - return err; - - at91_aic_hw_init(n_irqs); - - return 0; -} - -int __init at91_aic5_of_init(struct device_node *node, - struct device_node *parent) -{ - int err; - - at91_aic_caps |= AT91_AIC_CAP_AIC5; - n_irqs = NR_AIC5_IRQS; - at91_aic_chip.irq_ack = at91_aic5_mask_irq; - at91_aic_chip.irq_mask = at91_aic5_mask_irq; - at91_aic_chip.irq_unmask = at91_aic5_unmask_irq; - at91_aic_chip.irq_eoi = at91_aic5_eoi; - at91_aic_irq_ops.map = at91_aic5_irq_map; - - err = at91_aic_of_common_init(node, parent); - if (err) - return err; - - at91_aic5_hw_init(n_irqs); - - return 0; -} -#endif - -/* - * Initialize the AIC interrupt controller. - */ -void __init at91_aic_init(unsigned int *priority, unsigned int ext_irq_mask) -{ - unsigned int i; - int irq_base; - - at91_extern_irq = kzalloc(BITS_TO_LONGS(n_irqs) - * sizeof(*at91_extern_irq), GFP_KERNEL); - - if (at91_aic_pm_init() || at91_extern_irq == NULL) - panic("Unable to allocate bit maps\n"); - - *at91_extern_irq = ext_irq_mask; - - at91_aic_base = ioremap(AT91_AIC, 512); - if (!at91_aic_base) - panic("Unable to ioremap AIC registers\n"); - - /* Add irq domain for AIC */ - irq_base = irq_alloc_descs(-1, 0, n_irqs, 0); - if (irq_base < 0) { - WARN(1, "Cannot allocate irq_descs, assuming pre-allocated\n"); - irq_base = 0; - } - at91_aic_domain = irq_domain_add_legacy(at91_aic_np, n_irqs, - irq_base, 0, - &irq_domain_simple_ops, NULL); - - if (!at91_aic_domain) - panic("Unable to add AIC irq domain\n"); - - irq_set_default_host(at91_aic_domain); - - /* - * The IVR is used by macro get_irqnr_and_base to read and verify. - * The irq number is NR_AIC_IRQS when a spurious interrupt has occurred. - */ - for (i = 0; i < n_irqs; i++) { - /* Put hardware irq number in Source Vector Register: */ - at91_aic_write(AT91_AIC_SVR(i), NR_IRQS_LEGACY + i); - /* Active Low interrupt, with the specified priority */ - at91_aic_write(AT91_AIC_SMR(i), AT91_AIC_SRCTYPE_LOW | priority[i]); - irq_set_chip_and_handler(NR_IRQS_LEGACY + i, &at91_aic_chip, handle_fasteoi_irq); - set_irq_flags(i, IRQF_VALID | IRQF_PROBE); - } - - at91_aic_hw_init(n_irqs); -} diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 530db30..d2a24e8 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -26,9 +26,9 @@ #include <asm/mach/irq.h> #include <mach/at91_pmc.h> +#include <mach/at91_aic.h> #include <mach/cpu.h> -#include "at91_aic.h" #include "generic.h" #include "pm.h" diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index cda4cb5..208b708 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_IRQCHIP) += irqchip.o +obj-$(CONFIG_ARCH_AT91) += irq-at91.o obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o obj-$(CONFIG_ARCH_EXYNOS) += exynos-combiner.o obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o diff --git a/drivers/irqchip/irq-at91.c b/drivers/irqchip/irq-at91.c new file mode 100644 index 0000000..daf2959 --- /dev/null +++ b/drivers/irqchip/irq-at91.c @@ -0,0 +1,547 @@ +/* + * linux/arch/arm/mach-at91/irq.c + * + * Copyright (C) 2004 SAN People + * Copyright (C) 2004 ATMEL + * Copyright (C) Rick Bronson + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/mm.h> +#include <linux/bitmap.h> +#include <linux/types.h> +#include <linux/irq.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> +#include <linux/irqdomain.h> +#include <linux/err.h> +#include <linux/slab.h> + +#include <mach/hardware.h> +#include <asm/irq.h> +#include <asm/setup.h> + +#include <asm/exception.h> +#include <asm/mach/arch.h> +#include <asm/mach/irq.h> +#include <asm/mach/map.h> + +#include <mach/at91_aic.h> + +void __iomem *at91_aic_base; +static struct irq_domain *at91_aic_domain; +static struct device_node *at91_aic_np; +static unsigned int n_irqs = NR_AIC_IRQS; +static unsigned long at91_aic_caps = 0; + +/* AIC5 introduces a Source Select Register */ +#define AT91_AIC_CAP_AIC5 (1 << 0) +#define has_aic5() (at91_aic_caps & AT91_AIC_CAP_AIC5) + +#ifdef CONFIG_PM + +static unsigned long *wakeups; +static unsigned long *backups; + +#define set_backup(bit) set_bit(bit, backups) +#define clear_backup(bit) clear_bit(bit, backups) + +static int at91_aic_pm_init(void) +{ + backups = kzalloc(BITS_TO_LONGS(n_irqs) * sizeof(*backups), GFP_KERNEL); + if (!backups) + return -ENOMEM; + + wakeups = kzalloc(BITS_TO_LONGS(n_irqs) * sizeof(*backups), GFP_KERNEL); + if (!wakeups) { + kfree(backups); + return -ENOMEM; + } + + return 0; +} + +static int at91_aic_set_wake(struct irq_data *d, unsigned value) +{ + if (unlikely(d->hwirq >= n_irqs)) + return -EINVAL; + + if (value) + set_bit(d->hwirq, wakeups); + else + clear_bit(d->hwirq, wakeups); + + return 0; +} + +void at91_irq_suspend(void) +{ + int bit = -1; + + if (has_aic5()) { + /* disable enabled irqs */ + while ((bit = find_next_bit(backups, n_irqs, bit + 1)) < n_irqs) { + at91_aic_write(AT91_AIC5_SSR, + bit & AT91_AIC5_INTSEL_MSK); + at91_aic_write(AT91_AIC5_IDCR, 1); + } + /* enable wakeup irqs */ + bit = -1; + while ((bit = find_next_bit(wakeups, n_irqs, bit + 1)) < n_irqs) { + at91_aic_write(AT91_AIC5_SSR, + bit & AT91_AIC5_INTSEL_MSK); + at91_aic_write(AT91_AIC5_IECR, 1); + } + } else { + at91_aic_write(AT91_AIC_IDCR, *backups); + at91_aic_write(AT91_AIC_IECR, *wakeups); + } +} + +void at91_irq_resume(void) +{ + int bit = -1; + + if (has_aic5()) { + /* disable wakeup irqs */ + while ((bit = find_next_bit(wakeups, n_irqs, bit + 1)) < n_irqs) { + at91_aic_write(AT91_AIC5_SSR, + bit & AT91_AIC5_INTSEL_MSK); + at91_aic_write(AT91_AIC5_IDCR, 1); + } + /* enable irqs disabled for suspend */ + bit = -1; + while ((bit = find_next_bit(backups, n_irqs, bit + 1)) < n_irqs) { + at91_aic_write(AT91_AIC5_SSR, + bit & AT91_AIC5_INTSEL_MSK); + at91_aic_write(AT91_AIC5_IECR, 1); + } + } else { + at91_aic_write(AT91_AIC_IDCR, *wakeups); + at91_aic_write(AT91_AIC_IECR, *backups); + } +} + +#else +static inline int at91_aic_pm_init(void) +{ + return 0; +} + +#define set_backup(bit) +#define clear_backup(bit) +#define at91_aic_set_wake NULL + +#endif /* CONFIG_PM */ + +asmlinkage void __exception_irq_entry +at91_aic_handle_irq(struct pt_regs *regs) +{ + u32 irqnr; + u32 irqstat; + + irqnr = at91_aic_read(AT91_AIC_IVR); + irqstat = at91_aic_read(AT91_AIC_ISR); + + /* + * ISR value is 0 when there is no current interrupt or when there is + * a spurious interrupt + */ + if (!irqstat) + at91_aic_write(AT91_AIC_EOICR, 0); + else + handle_IRQ(irqnr, regs); +} + +asmlinkage void __exception_irq_entry +at91_aic5_handle_irq(struct pt_regs *regs) +{ + u32 irqnr; + u32 irqstat; + + irqnr = at91_aic_read(AT91_AIC5_IVR); + irqstat = at91_aic_read(AT91_AIC5_ISR); + + if (!irqstat) + at91_aic_write(AT91_AIC5_EOICR, 0); + else + handle_IRQ(irqnr, regs); +} + +static void at91_aic_mask_irq(struct irq_data *d) +{ + /* Disable interrupt on AIC */ + at91_aic_write(AT91_AIC_IDCR, 1 << d->hwirq); + /* Update ISR cache */ + clear_backup(d->hwirq); +} + +static void __maybe_unused at91_aic5_mask_irq(struct irq_data *d) +{ + /* Disable interrupt on AIC5 */ + at91_aic_write(AT91_AIC5_SSR, d->hwirq & AT91_AIC5_INTSEL_MSK); + at91_aic_write(AT91_AIC5_IDCR, 1); + /* Update ISR cache */ + clear_backup(d->hwirq); +} + +static void at91_aic_unmask_irq(struct irq_data *d) +{ + /* Enable interrupt on AIC */ + at91_aic_write(AT91_AIC_IECR, 1 << d->hwirq); + /* Update ISR cache */ + set_backup(d->hwirq); +} + +static void __maybe_unused at91_aic5_unmask_irq(struct irq_data *d) +{ + /* Enable interrupt on AIC5 */ + at91_aic_write(AT91_AIC5_SSR, d->hwirq & AT91_AIC5_INTSEL_MSK); + at91_aic_write(AT91_AIC5_IECR, 1); + /* Update ISR cache */ + set_backup(d->hwirq); +} + +static void at91_aic_eoi(struct irq_data *d) +{ + /* + * Mark end-of-interrupt on AIC, the controller doesn't care about + * the value written. Moreover it's a write-only register. + */ + at91_aic_write(AT91_AIC_EOICR, 0); +} + +static void __maybe_unused at91_aic5_eoi(struct irq_data *d) +{ + at91_aic_write(AT91_AIC5_EOICR, 0); +} + +unsigned long *at91_extern_irq; + +#define is_extern_irq(hwirq) test_bit(hwirq, at91_extern_irq) + +static int at91_aic_compute_srctype(struct irq_data *d, unsigned type) +{ + int srctype; + + switch (type) { + case IRQ_TYPE_LEVEL_HIGH: + srctype = AT91_AIC_SRCTYPE_HIGH; + break; + case IRQ_TYPE_EDGE_RISING: + srctype = AT91_AIC_SRCTYPE_RISING; + break; + case IRQ_TYPE_LEVEL_LOW: + if ((d->hwirq == AT91_ID_FIQ) || is_extern_irq(d->hwirq)) /* only supported on external interrupts */ + srctype = AT91_AIC_SRCTYPE_LOW; + else + srctype = -EINVAL; + break; + case IRQ_TYPE_EDGE_FALLING: + if ((d->hwirq == AT91_ID_FIQ) || is_extern_irq(d->hwirq)) /* only supported on external interrupts */ + srctype = AT91_AIC_SRCTYPE_FALLING; + else + srctype = -EINVAL; + break; + default: + srctype = -EINVAL; + } + + return srctype; +} + +static int at91_aic_set_type(struct irq_data *d, unsigned type) +{ + unsigned int smr; + int srctype; + + srctype = at91_aic_compute_srctype(d, type); + if (srctype < 0) + return srctype; + + if (has_aic5()) { + at91_aic_write(AT91_AIC5_SSR, + d->hwirq & AT91_AIC5_INTSEL_MSK); + smr = at91_aic_read(AT91_AIC5_SMR) & ~AT91_AIC_SRCTYPE; + at91_aic_write(AT91_AIC5_SMR, smr | srctype); + } else { + smr = at91_aic_read(AT91_AIC_SMR(d->hwirq)) + & ~AT91_AIC_SRCTYPE; + at91_aic_write(AT91_AIC_SMR(d->hwirq), smr | srctype); + } + + return 0; +} + +static struct irq_chip at91_aic_chip = { + .name = "AIC", + .irq_mask = at91_aic_mask_irq, + .irq_unmask = at91_aic_unmask_irq, + .irq_set_type = at91_aic_set_type, + .irq_set_wake = at91_aic_set_wake, + .irq_eoi = at91_aic_eoi, +}; + +static void __init at91_aic_hw_init(unsigned int spu_vector) +{ + int i; + + /* + * Perform 8 End Of Interrupt Command to make sure AIC + * will not Lock out nIRQ + */ + for (i = 0; i < 8; i++) + at91_aic_write(AT91_AIC_EOICR, 0); + + /* + * Spurious Interrupt ID in Spurious Vector Register. + * When there is no current interrupt, the IRQ Vector Register + * reads the value stored in AIC_SPU + */ + at91_aic_write(AT91_AIC_SPU, spu_vector); + + /* No debugging in AIC: Debug (Protect) Control Register */ + at91_aic_write(AT91_AIC_DCR, 0); + + /* Disable and clear all interrupts initially */ + at91_aic_write(AT91_AIC_IDCR, 0xFFFFFFFF); + at91_aic_write(AT91_AIC_ICCR, 0xFFFFFFFF); +} + +static void __init __maybe_unused at91_aic5_hw_init(unsigned int spu_vector) +{ + int i; + + /* + * Perform 8 End Of Interrupt Command to make sure AIC + * will not Lock out nIRQ + */ + for (i = 0; i < 8; i++) + at91_aic_write(AT91_AIC5_EOICR, 0); + + /* + * Spurious Interrupt ID in Spurious Vector Register. + * When there is no current interrupt, the IRQ Vector Register + * reads the value stored in AIC_SPU + */ + at91_aic_write(AT91_AIC5_SPU, spu_vector); + + /* No debugging in AIC: Debug (Protect) Control Register */ + at91_aic_write(AT91_AIC5_DCR, 0); + + /* Disable and clear all interrupts initially */ + for (i = 0; i < n_irqs; i++) { + at91_aic_write(AT91_AIC5_SSR, i & AT91_AIC5_INTSEL_MSK); + at91_aic_write(AT91_AIC5_IDCR, 1); + at91_aic_write(AT91_AIC5_ICCR, 1); + } +} + +#if defined(CONFIG_OF) +static unsigned int *at91_aic_irq_priorities; + +static int at91_aic_irq_map(struct irq_domain *h, unsigned int virq, + irq_hw_number_t hw) +{ + /* Put virq number in Source Vector Register */ + at91_aic_write(AT91_AIC_SVR(hw), virq); + + /* Active Low interrupt, with priority */ + at91_aic_write(AT91_AIC_SMR(hw), + AT91_AIC_SRCTYPE_LOW | at91_aic_irq_priorities[hw]); + + irq_set_chip_and_handler(virq, &at91_aic_chip, handle_fasteoi_irq); + set_irq_flags(virq, IRQF_VALID | IRQF_PROBE); + + return 0; +} + +static int at91_aic5_irq_map(struct irq_domain *h, unsigned int virq, + irq_hw_number_t hw) +{ + at91_aic_write(AT91_AIC5_SSR, hw & AT91_AIC5_INTSEL_MSK); + + /* Put virq number in Source Vector Register */ + at91_aic_write(AT91_AIC5_SVR, virq); + + /* Active Low interrupt, with priority */ + at91_aic_write(AT91_AIC5_SMR, + AT91_AIC_SRCTYPE_LOW | at91_aic_irq_priorities[hw]); + + irq_set_chip_and_handler(virq, &at91_aic_chip, handle_fasteoi_irq); + set_irq_flags(virq, IRQF_VALID | IRQF_PROBE); + + return 0; +} + +static int at91_aic_irq_domain_xlate(struct irq_domain *d, struct device_node *ctrlr, + const u32 *intspec, unsigned int intsize, + irq_hw_number_t *out_hwirq, unsigned int *out_type) +{ + if (WARN_ON(intsize < 3)) + return -EINVAL; + if (WARN_ON(intspec[0] >= n_irqs)) + return -EINVAL; + if (WARN_ON((intspec[2] < AT91_AIC_IRQ_MIN_PRIORITY) + || (intspec[2] > AT91_AIC_IRQ_MAX_PRIORITY))) + return -EINVAL; + + *out_hwirq = intspec[0]; + *out_type = intspec[1] & IRQ_TYPE_SENSE_MASK; + at91_aic_irq_priorities[*out_hwirq] = intspec[2]; + + return 0; +} + +static struct irq_domain_ops at91_aic_irq_ops = { + .map = at91_aic_irq_map, + .xlate = at91_aic_irq_domain_xlate, +}; + +int __init at91_aic_of_common_init(struct device_node *node, + struct device_node *parent) +{ + struct property *prop; + const __be32 *p; + u32 val; + + at91_extern_irq = kzalloc(BITS_TO_LONGS(n_irqs) + * sizeof(*at91_extern_irq), GFP_KERNEL); + if (!at91_extern_irq) + return -ENOMEM; + + if (at91_aic_pm_init()) { + kfree(at91_extern_irq); + return -ENOMEM; + } + + at91_aic_irq_priorities = kzalloc(n_irqs + * sizeof(*at91_aic_irq_priorities), + GFP_KERNEL); + if (!at91_aic_irq_priorities) + return -ENOMEM; + + at91_aic_base = of_iomap(node, 0); + at91_aic_np = node; + + at91_aic_domain = irq_domain_add_linear(at91_aic_np, n_irqs, + &at91_aic_irq_ops, NULL); + if (!at91_aic_domain) + panic("Unable to add AIC irq domain (DT)\n"); + + of_property_for_each_u32(node, "atmel,external-irqs", prop, p, val) { + if (val >= n_irqs) + pr_warn("AIC: external irq %d >= %d skip it\n", + val, n_irqs); + else + set_bit(val, at91_extern_irq); + } + + irq_set_default_host(at91_aic_domain); + + return 0; +} + +int __init at91_aic_of_init(struct device_node *node, + struct device_node *parent) +{ + int err; + + err = at91_aic_of_common_init(node, parent); + if (err) + return err; + + at91_aic_hw_init(n_irqs); + + return 0; +} + +int __init at91_aic5_of_init(struct device_node *node, + struct device_node *parent) +{ + int err; + + at91_aic_caps |= AT91_AIC_CAP_AIC5; + n_irqs = NR_AIC5_IRQS; + at91_aic_chip.irq_ack = at91_aic5_mask_irq; + at91_aic_chip.irq_mask = at91_aic5_mask_irq; + at91_aic_chip.irq_unmask = at91_aic5_unmask_irq; + at91_aic_chip.irq_eoi = at91_aic5_eoi; + at91_aic_irq_ops.map = at91_aic5_irq_map; + + err = at91_aic_of_common_init(node, parent); + if (err) + return err; + + at91_aic5_hw_init(n_irqs); + + return 0; +} +#endif + +/* + * Initialize the AIC interrupt controller. + */ +void __init at91_aic_init(unsigned int *priority, unsigned int ext_irq_mask) +{ + unsigned int i; + int irq_base; + + at91_extern_irq = kzalloc(BITS_TO_LONGS(n_irqs) + * sizeof(*at91_extern_irq), GFP_KERNEL); + + if (at91_aic_pm_init() || at91_extern_irq == NULL) + panic("Unable to allocate bit maps\n"); + + *at91_extern_irq = ext_irq_mask; + + at91_aic_base = ioremap(AT91_AIC, 512); + if (!at91_aic_base) + panic("Unable to ioremap AIC registers\n"); + + /* Add irq domain for AIC */ + irq_base = irq_alloc_descs(-1, 0, n_irqs, 0); + if (irq_base < 0) { + WARN(1, "Cannot allocate irq_descs, assuming pre-allocated\n"); + irq_base = 0; + } + at91_aic_domain = irq_domain_add_legacy(at91_aic_np, n_irqs, + irq_base, 0, + &irq_domain_simple_ops, NULL); + + if (!at91_aic_domain) + panic("Unable to add AIC irq domain\n"); + + irq_set_default_host(at91_aic_domain); + + /* + * The IVR is used by macro get_irqnr_and_base to read and verify. + * The irq number is NR_AIC_IRQS when a spurious interrupt has occurred. + */ + for (i = 0; i < n_irqs; i++) { + /* Put hardware irq number in Source Vector Register: */ + at91_aic_write(AT91_AIC_SVR(i), NR_IRQS_LEGACY + i); + /* Active Low interrupt, with the specified priority */ + at91_aic_write(AT91_AIC_SMR(i), AT91_AIC_SRCTYPE_LOW | priority[i]); + irq_set_chip_and_handler(NR_IRQS_LEGACY + i, &at91_aic_chip, handle_fasteoi_irq); + set_irq_flags(i, IRQF_VALID | IRQF_PROBE); + } + + at91_aic_hw_init(n_irqs); +} -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 20+ messages in thread
end of thread, other threads:[~2013-05-23 13:00 UTC | newest] Thread overview: 20+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-05-23 9:05 [RESEND PATCH 0/3] ARM: at91: move aic driver to drivers/irqchip Boris BREZILLON 2013-05-23 9:05 ` [PATCH 1/3] ARM: at91: move at91 " Boris BREZILLON 2013-05-23 9:06 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-23 9:51 ` boris brezillon 2013-05-23 10:09 ` Thomas Petazzoni 2013-05-23 10:09 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-23 10:20 ` Thomas Petazzoni 2013-05-23 10:26 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-23 11:22 ` Thomas Petazzoni 2013-05-23 11:58 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-23 12:09 ` Thomas Petazzoni 2013-05-23 13:00 ` Nicolas Ferre 2013-05-23 10:18 ` Russell King - ARM Linux 2013-05-23 11:59 ` Jean-Christophe PLAGNIOL-VILLARD 2013-05-23 12:13 ` Thomas Petazzoni 2013-05-23 12:42 ` Boris BREZILLON 2013-05-23 12:44 ` boris brezillon 2013-05-23 9:05 ` [PATCH 2/3] ARM: at91: use IRQCHIP_DECLARE instead of machine specific init_irq Boris BREZILLON 2013-05-23 9:05 ` [PATCH 3/3] ARM: at91: use set_handle_irq instead of machine specific handle_irq Boris BREZILLON -- strict thread matches above, loose matches on Subject: below -- 2013-05-23 8:49 [PATCH 0/3] ARM: at91: move aic driver to drivers/irqchip Boris BREZILLON 2013-05-23 8:49 ` [PATCH 1/3] ARM: at91: move at91 " Boris BREZILLON
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).