diff options
author | Jamie Iles <jamie@jamieiles.com> | 2011-12-12 15:17:37 -0500 |
---|---|---|
committer | Jamie Iles <jamie@jamieiles.com> | 2011-12-18 05:48:19 -0500 |
commit | 98e27a5c13badb5c56d9d1d6c8ec210753ac1195 (patch) | |
tree | 4de656653f8bc35f228dead9bf4c868b87b22f71 | |
parent | 513c4dd698d1341a53d8a7530ecefb44cb1e2395 (diff) |
ARM: picoxcell: don't reserve irq_descs
All irq_desc's are now dynamically allocated so we don't need to
statically reserve them.
v2: - select SPARSE_IRQ and set .nr_irqs to NR_IRQS_LEGACY to skip
ISA and IRQ 0.
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-picoxcell/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-picoxcell/include/mach/irqs.h | 9 |
3 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index abba5b8c9d74..0d961cb7be9a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -650,6 +650,7 @@ config ARCH_PICOXCELL | |||
650 | select HAVE_SCHED_CLOCK | 650 | select HAVE_SCHED_CLOCK |
651 | select HAVE_TCM | 651 | select HAVE_TCM |
652 | select NO_IOPORT | 652 | select NO_IOPORT |
653 | select SPARSE_IRQ | ||
653 | select USE_OF | 654 | select USE_OF |
654 | help | 655 | help |
655 | This enables support for systems based on the Picochip picoXcell | 656 | This enables support for systems based on the Picochip picoXcell |
diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c index ad871bd7b1ab..d34b3335801e 100644 --- a/arch/arm/mach-picoxcell/common.c +++ b/arch/arm/mach-picoxcell/common.c | |||
@@ -45,7 +45,7 @@ static void __init picoxcell_init_irq(void) | |||
45 | 45 | ||
46 | DT_MACHINE_START(PICOXCELL, "Picochip picoXcell") | 46 | DT_MACHINE_START(PICOXCELL, "Picochip picoXcell") |
47 | .map_io = picoxcell_map_io, | 47 | .map_io = picoxcell_map_io, |
48 | .nr_irqs = ARCH_NR_IRQS, | 48 | .nr_irqs = NR_IRQS_LEGACY, |
49 | .init_irq = picoxcell_init_irq, | 49 | .init_irq = picoxcell_init_irq, |
50 | .handle_irq = vic_handle_irq, | 50 | .handle_irq = vic_handle_irq, |
51 | .timer = &picoxcell_timer, | 51 | .timer = &picoxcell_timer, |
diff --git a/arch/arm/mach-picoxcell/include/mach/irqs.h b/arch/arm/mach-picoxcell/include/mach/irqs.h index 4d13ed970919..59eac1ee2820 100644 --- a/arch/arm/mach-picoxcell/include/mach/irqs.h +++ b/arch/arm/mach-picoxcell/include/mach/irqs.h | |||
@@ -1,8 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2011 Picochip Ltd., Jamie Iles | 2 | * Copyright (c) 2011 Picochip Ltd., Jamie Iles |
3 | * | 3 | * |
4 | * This file contains the hardware definitions of the picoXcell SoC devices. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License as published by | 5 | * it under the terms of the GNU General Public License as published by |
8 | * the Free Software Foundation; either version 2 of the License, or | 6 | * the Free Software Foundation; either version 2 of the License, or |
@@ -16,10 +14,7 @@ | |||
16 | #ifndef __MACH_IRQS_H | 14 | #ifndef __MACH_IRQS_H |
17 | #define __MACH_IRQS_H | 15 | #define __MACH_IRQS_H |
18 | 16 | ||
19 | #define ARCH_NR_IRQS 64 | 17 | /* We dynamically allocate our irq_desc's. */ |
20 | #define NR_IRQS (128 + ARCH_NR_IRQS) | 18 | #define NR_IRQS 0 |
21 | |||
22 | #define IRQ_VIC0_BASE 0 | ||
23 | #define IRQ_VIC1_BASE 32 | ||
24 | 19 | ||
25 | #endif /* __MACH_IRQS_H */ | 20 | #endif /* __MACH_IRQS_H */ |