diff options
author | Will Deacon <will.deacon@arm.com> | 2010-01-20 13:06:26 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-02 04:35:37 -0400 |
commit | 3081e43b97cb50a80ebd98ce4b60e4853ad38424 (patch) | |
tree | eb773a0dae54bd31c709b9ca5b84fb22aed0af88 /arch | |
parent | d1914c7e75cff736e2c2dac13ad2fe20c2567e68 (diff) |
ARM: 5890/1: Fix incorrect Realview board IRQs for L220 and PMU
In anticipation of PMU support for Realview boards, the IRQs defined
for some of these boards need updating.
This patch removes incorrect L220 IRQ definitions, corrects incorrect PMU
IRQs and adds any missing IRQs that are required.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-realview/include/mach/irqs-pb1176.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/irqs-pba8.h | 8 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/irqs-pbx.h | 14 |
3 files changed, 7 insertions, 16 deletions
diff --git a/arch/arm/mach-realview/include/mach/irqs-pb1176.h b/arch/arm/mach-realview/include/mach/irqs-pb1176.h index 2410d4f8ddd3..830055bb8628 100644 --- a/arch/arm/mach-realview/include/mach/irqs-pb1176.h +++ b/arch/arm/mach-realview/include/mach/irqs-pb1176.h | |||
@@ -31,6 +31,7 @@ | |||
31 | #define IRQ_DC1176_SOFTINT (IRQ_DC1176_GIC_START + 1) /* Software interrupt */ | 31 | #define IRQ_DC1176_SOFTINT (IRQ_DC1176_GIC_START + 1) /* Software interrupt */ |
32 | #define IRQ_DC1176_COMMRx (IRQ_DC1176_GIC_START + 2) /* Debug Comm Rx interrupt */ | 32 | #define IRQ_DC1176_COMMRx (IRQ_DC1176_GIC_START + 2) /* Debug Comm Rx interrupt */ |
33 | #define IRQ_DC1176_COMMTx (IRQ_DC1176_GIC_START + 3) /* Debug Comm Tx interrupt */ | 33 | #define IRQ_DC1176_COMMTx (IRQ_DC1176_GIC_START + 3) /* Debug Comm Tx interrupt */ |
34 | #define IRQ_DC1176_CORE_PMU (IRQ_DC1176_GIC_START + 7) /* Core PMU interrupt */ | ||
34 | #define IRQ_DC1176_TIMER0 (IRQ_DC1176_GIC_START + 8) /* Timer 0 */ | 35 | #define IRQ_DC1176_TIMER0 (IRQ_DC1176_GIC_START + 8) /* Timer 0 */ |
35 | #define IRQ_DC1176_TIMER1 (IRQ_DC1176_GIC_START + 9) /* Timer 1 */ | 36 | #define IRQ_DC1176_TIMER1 (IRQ_DC1176_GIC_START + 9) /* Timer 1 */ |
36 | #define IRQ_DC1176_TIMER2 (IRQ_DC1176_GIC_START + 10) /* Timer 2 */ | 37 | #define IRQ_DC1176_TIMER2 (IRQ_DC1176_GIC_START + 10) /* Timer 2 */ |
diff --git a/arch/arm/mach-realview/include/mach/irqs-pba8.h b/arch/arm/mach-realview/include/mach/irqs-pba8.h index 86792a9f2ab6..4a88a4edb651 100644 --- a/arch/arm/mach-realview/include/mach/irqs-pba8.h +++ b/arch/arm/mach-realview/include/mach/irqs-pba8.h | |||
@@ -23,12 +23,6 @@ | |||
23 | 23 | ||
24 | #define IRQ_PBA8_GIC_START 32 | 24 | #define IRQ_PBA8_GIC_START 32 |
25 | 25 | ||
26 | /* L220 | ||
27 | #define IRQ_PBA8_L220_EVENT (IRQ_PBA8_GIC_START + 29) | ||
28 | #define IRQ_PBA8_L220_SLAVE (IRQ_PBA8_GIC_START + 30) | ||
29 | #define IRQ_PBA8_L220_DECODE (IRQ_PBA8_GIC_START + 31) | ||
30 | */ | ||
31 | |||
32 | /* | 26 | /* |
33 | * PB-A8 on-board gic irq sources | 27 | * PB-A8 on-board gic irq sources |
34 | */ | 28 | */ |
@@ -65,6 +59,8 @@ | |||
65 | #define IRQ_PBA8_TSPEN (IRQ_PBA8_GIC_START + 30) /* Touchscreen pen */ | 59 | #define IRQ_PBA8_TSPEN (IRQ_PBA8_GIC_START + 30) /* Touchscreen pen */ |
66 | #define IRQ_PBA8_TSKPAD (IRQ_PBA8_GIC_START + 31) /* Touchscreen keypad */ | 60 | #define IRQ_PBA8_TSKPAD (IRQ_PBA8_GIC_START + 31) /* Touchscreen keypad */ |
67 | 61 | ||
62 | #define IRQ_PBA8_PMU (IRQ_PBA8_GIC_START + 47) /* Cortex-A8 PMU */ | ||
63 | |||
68 | /* ... */ | 64 | /* ... */ |
69 | #define IRQ_PBA8_PCI0 (IRQ_PBA8_GIC_START + 50) | 65 | #define IRQ_PBA8_PCI0 (IRQ_PBA8_GIC_START + 50) |
70 | #define IRQ_PBA8_PCI1 (IRQ_PBA8_GIC_START + 51) | 66 | #define IRQ_PBA8_PCI1 (IRQ_PBA8_GIC_START + 51) |
diff --git a/arch/arm/mach-realview/include/mach/irqs-pbx.h b/arch/arm/mach-realview/include/mach/irqs-pbx.h index deaad4302b17..206a3001f46b 100644 --- a/arch/arm/mach-realview/include/mach/irqs-pbx.h +++ b/arch/arm/mach-realview/include/mach/irqs-pbx.h | |||
@@ -22,12 +22,6 @@ | |||
22 | 22 | ||
23 | #define IRQ_PBX_GIC_START 32 | 23 | #define IRQ_PBX_GIC_START 32 |
24 | 24 | ||
25 | /* L220 | ||
26 | #define IRQ_PBX_L220_EVENT (IRQ_PBX_GIC_START + 29) | ||
27 | #define IRQ_PBX_L220_SLAVE (IRQ_PBX_GIC_START + 30) | ||
28 | #define IRQ_PBX_L220_DECODE (IRQ_PBX_GIC_START + 31) | ||
29 | */ | ||
30 | |||
31 | /* | 25 | /* |
32 | * PBX on-board gic irq sources | 26 | * PBX on-board gic irq sources |
33 | */ | 27 | */ |
@@ -77,10 +71,10 @@ | |||
77 | #define IRQ_PBX_TIMER4_5 (IRQ_PBX_GIC_START + 41) /* Timer 0/1 (default timer) */ | 71 | #define IRQ_PBX_TIMER4_5 (IRQ_PBX_GIC_START + 41) /* Timer 0/1 (default timer) */ |
78 | #define IRQ_PBX_TIMER6_7 (IRQ_PBX_GIC_START + 42) /* Timer 2/3 */ | 72 | #define IRQ_PBX_TIMER6_7 (IRQ_PBX_GIC_START + 42) /* Timer 2/3 */ |
79 | /* ... */ | 73 | /* ... */ |
80 | #define IRQ_PBX_PMU_CPU3 (IRQ_PBX_GIC_START + 44) /* CPU PMU Interrupts */ | 74 | #define IRQ_PBX_PMU_CPU0 (IRQ_PBX_GIC_START + 44) /* CPU PMU Interrupts */ |
81 | #define IRQ_PBX_PMU_CPU2 (IRQ_PBX_GIC_START + 45) | 75 | #define IRQ_PBX_PMU_CPU1 (IRQ_PBX_GIC_START + 45) |
82 | #define IRQ_PBX_PMU_CPU1 (IRQ_PBX_GIC_START + 46) | 76 | #define IRQ_PBX_PMU_CPU2 (IRQ_PBX_GIC_START + 46) |
83 | #define IRQ_PBX_PMU_CPU0 (IRQ_PBX_GIC_START + 47) | 77 | #define IRQ_PBX_PMU_CPU3 (IRQ_PBX_GIC_START + 47) |
84 | 78 | ||
85 | /* ... */ | 79 | /* ... */ |
86 | #define IRQ_PBX_PCI0 (IRQ_PBX_GIC_START + 50) | 80 | #define IRQ_PBX_PCI0 (IRQ_PBX_GIC_START + 50) |