diff options
| author | Arnd Bergmann | 2013-03-14 17:30:53 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2013-03-14 17:34:56 +0100 |
| commit | 2f72a682f79d4eb2d96364d1a9abb7bd16c47afb (patch) | |
| tree | 1586695083b3b8bcb2c42e9c2440eda84be7a3f1 /arch/arm/mach-cns3xxx | |
| parent | ARM: cns3xxx: make mach header files local (diff) | |
| download | kernel-qcow2-linux-2f72a682f79d4eb2d96364d1a9abb7bd16c47afb.tar.gz kernel-qcow2-linux-2f72a682f79d4eb2d96364d1a9abb7bd16c47afb.tar.xz kernel-qcow2-linux-2f72a682f79d4eb2d96364d1a9abb7bd16c47afb.zip | |
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) MACHINE_START(CNS3420VB, "Cavium Networks CNS3420 Validation Board") .atag_offset = 0x100, + .nr_irqs = NR_IRQS_CNS3XXX, .map_io = cns3420_map_io, .init_irq = cns3xxx_init_irq, .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 @@ -/* - * Copyright 2000 Deep Blue Solutions Ltd. - * Copyright 2003 ARM Limited - * Copyright 2008 Cavium Networks - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, Version 2, as - * published by the Free Software Foundation. - */ - -#ifndef __MACH_IRQS_H -#define __MACH_IRQS_H - -#define IRQ_LOCALTIMER 29 -#define IRQ_LOCALWDOG 30 -#define IRQ_TC11MP_GIC_START 32 - -#include <mach/cns3xxx.h> - -#ifndef NR_IRQS -#error "NR_IRQS not defined by the board-specific files" -#endif - -#endif |