aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/integrator_ap.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-10-26 19:24:29 -0400
committerLinus Walleij <linus.walleij@linaro.org>2012-10-26 19:24:29 -0400
commitda72a66ba852fef3d5dfe02ab311a894e7d791e9 (patch)
tree4b37e0805f02e31490a76e53e9f60dbd293ebaba /arch/arm/mach-integrator/integrator_ap.c
parent3a6ca8c5c9e310d26fe090ac7c777c269661f0e6 (diff)
ARM: integrator: get rid of preallocated irq descriptors
The Integrators were using the .nr_irqs field of the machine descriptor to pre-allocate a number of descriptors at boot. This is not right: the irq chip implementations should allocate their descriptors themselves, and as a result the simple irqdomain code warns about it. Get rid of this by just deleting the .nr_irq field from the machine descriptors but take care: doing so makes the default implementation hog the first 16 IRQ numbers, so these cannot be used by the still static IRQ number assignments in the ATAG boot case. So for these, bump the IRQ numbers to begin at 64 and upward. Introduce an offset to offset all IRQ numbers if need be, though we don't expect to do that again as device tree comes along. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-integrator/integrator_ap.c')
-rw-r--r--arch/arm/mach-integrator/integrator_ap.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index e6617c134faf..4f13bc57e5a4 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -499,7 +499,6 @@ static const char * ap_dt_board_compat[] = {
499DT_MACHINE_START(INTEGRATOR_AP_DT, "ARM Integrator/AP (Device Tree)") 499DT_MACHINE_START(INTEGRATOR_AP_DT, "ARM Integrator/AP (Device Tree)")
500 .reserve = integrator_reserve, 500 .reserve = integrator_reserve,
501 .map_io = ap_map_io, 501 .map_io = ap_map_io,
502 .nr_irqs = NR_IRQS_INTEGRATOR_AP,
503 .init_early = ap_init_early, 502 .init_early = ap_init_early,
504 .init_irq = ap_init_irq_of, 503 .init_irq = ap_init_irq_of,
505 .handle_irq = fpga_handle_irq, 504 .handle_irq = fpga_handle_irq,
@@ -609,7 +608,6 @@ MACHINE_START(INTEGRATOR, "ARM-Integrator")
609 .atag_offset = 0x100, 608 .atag_offset = 0x100,
610 .reserve = integrator_reserve, 609 .reserve = integrator_reserve,
611 .map_io = ap_map_io, 610 .map_io = ap_map_io,
612 .nr_irqs = NR_IRQS_INTEGRATOR_AP,
613 .init_early = ap_init_early, 611 .init_early = ap_init_early,
614 .init_irq = ap_init_irq, 612 .init_irq = ap_init_irq,
615 .handle_irq = fpga_handle_irq, 613 .handle_irq = fpga_handle_irq,