diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-03-14 12:30:53 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-14 12:34:56 -0400 |
commit | 2f72a682f79d4eb2d96364d1a9abb7bd16c47afb (patch) | |
tree | 1586695083b3b8bcb2c42e9c2440eda84be7a3f1 /arch/arm/mach-cns3xxx | |
parent | 3f9fb2a08f55c79b4c6cde423c1e8ddcc5a49781 (diff) |
ARM: cns3xxx: enable sparse IRQ support
This trivially enables sparse IRQ on cns3xxx by moving the
nr_irqs definition from mach/irqs.h into the machine
descriptor. These interrupts will still get statically
assigned, so nothing changes here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-cns3xxx')
-rw-r--r-- | arch/arm/mach-cns3xxx/cns3420vb.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-cns3xxx/include/mach/irqs.h | 24 |
2 files changed, 1 insertions, 24 deletions
diff --git a/arch/arm/mach-cns3xxx/cns3420vb.c b/arch/arm/mach-cns3xxx/cns3420vb.c index d863d8729edc..ce096d678aa4 100644 --- a/arch/arm/mach-cns3xxx/cns3420vb.c +++ b/arch/arm/mach-cns3xxx/cns3420vb.c | |||
@@ -246,6 +246,7 @@ static void __init cns3420_map_io(void) | |||
246 | 246 | ||
247 | MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board") | 247 | MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board") |
248 | .atag_offset = 0x100, | 248 | .atag_offset = 0x100, |
249 | .nr_irqs = NR_IRQS_CNS3XXX, | ||
249 | .map_io = cns3420_map_io, | 250 | .map_io = cns3420_map_io, |
250 | .init_irq = cns3xxx_init_irq, | 251 | .init_irq = cns3xxx_init_irq, |
251 | .init_time = cns3xxx_timer_init, | 252 | .init_time = cns3xxx_timer_init, |
diff --git a/arch/arm/mach-cns3xxx/include/mach/irqs.h b/arch/arm/mach-cns3xxx/include/mach/irqs.h deleted file mode 100644 index 2ab96f8085c8..000000000000 --- a/arch/arm/mach-cns3xxx/include/mach/irqs.h +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2000 Deep Blue Solutions Ltd. | ||
3 | * Copyright 2003 ARM Limited | ||
4 | * Copyright 2008 Cavium Networks | ||
5 | * | ||
6 | * This file is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License, Version 2, as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | |||
11 | #ifndef __MACH_IRQS_H | ||
12 | #define __MACH_IRQS_H | ||
13 | |||
14 | #define IRQ_LOCALTIMER 29 | ||
15 | #define IRQ_LOCALWDOG 30 | ||
16 | #define IRQ_TC11MP_GIC_START 32 | ||
17 | |||
18 | #include <mach/cns3xxx.h> | ||
19 | |||
20 | #ifndef NR_IRQS | ||
21 | #error "NR_IRQS not defined by the board-specific files" | ||
22 | #endif | ||
23 | |||
24 | #endif | ||