diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-10-27 01:24:29 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-10-27 01:24:29 +0200 |
| commit | da72a66ba852fef3d5dfe02ab311a894e7d791e9 (patch) | |
| tree | 4b37e0805f02e31490a76e53e9f60dbd293ebaba /arch/arm/mach-integrator/integrator_ap.c | |
| parent | 3a6ca8c5c9e310d26fe090ac7c777c269661f0e6 (diff) | |
| download | linux-da72a66ba852fef3d5dfe02ab311a894e7d791e9.tar.gz linux-da72a66ba852fef3d5dfe02ab311a894e7d791e9.tar.bz2 linux-da72a66ba852fef3d5dfe02ab311a894e7d791e9.zip | |
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.c | 2 |
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[] = { DT_MACHINE_START(INTEGRATOR_AP_DT, "ARM Integrator/AP (Device Tree)") .reserve = integrator_reserve, .map_io = ap_map_io, - .nr_irqs = NR_IRQS_INTEGRATOR_AP, .init_early = ap_init_early, .init_irq = ap_init_irq_of, .handle_irq = fpga_handle_irq, @@ -609,7 +608,6 @@ MACHINE_START(INTEGRATOR, "ARM-Integrator") .atag_offset = 0x100, .reserve = integrator_reserve, .map_io = ap_map_io, - .nr_irqs = NR_IRQS_INTEGRATOR_AP, .init_early = ap_init_early, .init_irq = ap_init_irq, .handle_irq = fpga_handle_irq, |