diff options
Diffstat (limited to 'arch/arm/mach-sa1100/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/irqs.h | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/irqs.h b/arch/arm/mach-sa1100/include/mach/irqs.h index d18f21abef80..3790298b7142 100644 --- a/arch/arm/mach-sa1100/include/mach/irqs.h +++ b/arch/arm/mach-sa1100/include/mach/irqs.h | |||
| @@ -71,22 +71,19 @@ | |||
| 71 | /* | 71 | /* |
| 72 | * Figure out the MAX IRQ number. | 72 | * Figure out the MAX IRQ number. |
| 73 | * | 73 | * |
| 74 | * If we have an SA1111, the max IRQ is S1_BVD1_STSCHG+1. | 74 | * Neponset, SA1111 and UCB1x00 are sparse IRQ aware, so can dynamically |
| 75 | * If we have an LoCoMo, the max IRQ is IRQ_BOARD_START + 4 | 75 | * allocate their IRQs above NR_IRQS. |
| 76 | * Otherwise, we have the standard IRQs only. | 76 | * |
| 77 | * LoCoMo has 4 additional IRQs, but is not sparse IRQ aware, and so has | ||
| 78 | * to be included in the NR_IRQS calculation. | ||
| 77 | */ | 79 | */ |
| 78 | #ifdef CONFIG_SA1111 | 80 | #ifdef CONFIG_SHARP_LOCOMO |
| 79 | #define NR_IRQS (IRQ_BOARD_END + 55) | 81 | #define NR_IRQS_LOCOMO 4 |
| 80 | #elif defined(CONFIG_SHARP_LOCOMO) | ||
| 81 | #define NR_IRQS (IRQ_BOARD_START + 4) | ||
| 82 | #else | 82 | #else |
| 83 | #define NR_IRQS (IRQ_BOARD_START) | 83 | #define NR_IRQS_LOCOMO 0 |
| 84 | #endif | 84 | #endif |
| 85 | 85 | ||
| 86 | /* | 86 | #ifndef NR_IRQS |
| 87 | * Board specific IRQs. Define them here. | 87 | #define NR_IRQS (IRQ_BOARD_START + NR_IRQS_LOCOMO) |
| 88 | * Do not surround them with ifdefs. | 88 | #endif |
| 89 | */ | 89 | #define SA1100_NR_IRQS (IRQ_BOARD_START + NR_IRQS_LOCOMO) |
| 90 | #define IRQ_NEPONSET_SMC9196 (IRQ_BOARD_START + 0) | ||
| 91 | #define IRQ_NEPONSET_USAR (IRQ_BOARD_START + 1) | ||
| 92 | #define IRQ_NEPONSET_SA1111 (IRQ_BOARD_START + 2) | ||