diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2011-09-06 05:23:45 -0400 |
---|---|---|
committer | Marc Zyngier <marc.zyngier@arm.com> | 2011-11-15 13:14:02 -0500 |
commit | 6b2f55d7851aa358d3a99cff344c560c4967f042 (patch) | |
tree | bc7bcbc262882d091251294da1740e11f8b59968 /arch/arm/mach-omap2/board-n8x0.c | |
parent | 2db1499784da653f7e257d98fefdebc65fde7c40 (diff) |
ARM: omap2plus: convert to CONFIG_MULTI_IRQ_HANDLER
Convert the omap2plus platforms to be using CONFIG_MULTI_IRQ_HANDLER.
Each machine is modified to provide either omap2_intc_handle_irq(),
omap3_intc_handle_irq() or gic_handle_irq().
This allows for a major cleanup, removing the MULTI_OMAP setup
from the interrupt path.
Tested on both Panda and IGEPv2 (single kernel image)
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-n8x0.c')
-rw-r--r-- | arch/arm/mach-omap2/board-n8x0.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index e9d5f4a3d064..fa040524c19a 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c | |||
@@ -689,6 +689,7 @@ MACHINE_START(NOKIA_N800, "Nokia N800") | |||
689 | .map_io = omap242x_map_io, | 689 | .map_io = omap242x_map_io, |
690 | .init_early = omap2420_init_early, | 690 | .init_early = omap2420_init_early, |
691 | .init_irq = omap2_init_irq, | 691 | .init_irq = omap2_init_irq, |
692 | .handle_irq = omap2_intc_handle_irq, | ||
692 | .init_machine = n8x0_init_machine, | 693 | .init_machine = n8x0_init_machine, |
693 | .timer = &omap2_timer, | 694 | .timer = &omap2_timer, |
694 | MACHINE_END | 695 | MACHINE_END |
@@ -699,6 +700,7 @@ MACHINE_START(NOKIA_N810, "Nokia N810") | |||
699 | .map_io = omap242x_map_io, | 700 | .map_io = omap242x_map_io, |
700 | .init_early = omap2420_init_early, | 701 | .init_early = omap2420_init_early, |
701 | .init_irq = omap2_init_irq, | 702 | .init_irq = omap2_init_irq, |
703 | .handle_irq = omap2_intc_handle_irq, | ||
702 | .init_machine = n8x0_init_machine, | 704 | .init_machine = n8x0_init_machine, |
703 | .timer = &omap2_timer, | 705 | .timer = &omap2_timer, |
704 | MACHINE_END | 706 | MACHINE_END |
@@ -709,6 +711,7 @@ MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX") | |||
709 | .map_io = omap242x_map_io, | 711 | .map_io = omap242x_map_io, |
710 | .init_early = omap2420_init_early, | 712 | .init_early = omap2420_init_early, |
711 | .init_irq = omap2_init_irq, | 713 | .init_irq = omap2_init_irq, |
714 | .handle_irq = omap2_intc_handle_irq, | ||
712 | .init_machine = n8x0_init_machine, | 715 | .init_machine = n8x0_init_machine, |
713 | .timer = &omap2_timer, | 716 | .timer = &omap2_timer, |
714 | MACHINE_END | 717 | MACHINE_END |