summaryrefslogtreecommitdiff
path: root/arch/arm/mach-prima2/common.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-03-19 14:21:44 +0400
committerArnd Bergmann <arnd@arndb.de>2013-03-25 15:29:39 +0400
commit60dbd7680f069c07525a825d805fd2644eae92e6 (patch)
tree3d53f1d6cdbde87a75902df0ff6a4b1b80ed53f9 /arch/arm/mach-prima2/common.c
parent67d71344fd09223820eb9de39b597ec29f035e89 (diff)
downloadlinux-60dbd7680f069c07525a825d805fd2644eae92e6.tar.xz
ARM: sirf: move irq driver to drivers/irqchip
This updates the irqchip drier for prima2 to the current practices by moving it into drivers/irqchip and integrating it into the irqchip_init infrastructure. We also now use a linear irq domain as a preparation for sparse IRQ suport. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/mach-prima2/common.c')
-rw-r--r--arch/arm/mach-prima2/common.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c
index 72efb4ff2803..15c14dfb47a0 100644
--- a/arch/arm/mach-prima2/common.c
+++ b/arch/arm/mach-prima2/common.c
@@ -46,11 +46,8 @@ static const char *atlas6_dt_match[] __initdata = {
DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")
/* Maintainer: Barry Song <baohua.song@csr.com> */
.map_io = sirfsoc_map_io,
- .init_irq = sirfsoc_of_irq_init,
+ .init_irq = irqchip_init,
.init_time = sirfsoc_prima2_timer_init,
-#ifdef CONFIG_MULTI_IRQ_HANDLER
- .handle_irq = sirfsoc_handle_irq,
-#endif
.init_machine = sirfsoc_mach_init,
.init_late = sirfsoc_init_late,
.dt_compat = atlas6_dt_match,
@@ -67,11 +64,8 @@ static const char *prima2_dt_match[] __initdata = {
DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
/* Maintainer: Barry Song <baohua.song@csr.com> */
.map_io = sirfsoc_map_io,
- .init_irq = sirfsoc_of_irq_init,
+ .init_irq = irqchip_init,
.init_time = sirfsoc_prima2_timer_init,
-#ifdef CONFIG_MULTI_IRQ_HANDLER
- .handle_irq = sirfsoc_handle_irq,
-#endif
.dma_zone_size = SZ_256M,
.init_machine = sirfsoc_mach_init,
.init_late = sirfsoc_init_late,