tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Will Deacon and committed by
Russell King 3081e43b d1914c7e

+7 -16
+1
arch/arm/mach-realview/include/mach/irqs-pb1176.h
··· 31 31 #define IRQ_DC1176_SOFTINT (IRQ_DC1176_GIC_START + 1) /* Software interrupt */ 32 32 #define IRQ_DC1176_COMMRx (IRQ_DC1176_GIC_START + 2) /* Debug Comm Rx interrupt */ 33 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 35 #define IRQ_DC1176_TIMER0 (IRQ_DC1176_GIC_START + 8) /* Timer 0 */ 35 36 #define IRQ_DC1176_TIMER1 (IRQ_DC1176_GIC_START + 9) /* Timer 1 */ 36 37 #define IRQ_DC1176_TIMER2 (IRQ_DC1176_GIC_START + 10) /* Timer 2 */
+2 -6
arch/arm/mach-realview/include/mach/irqs-pba8.h
··· 23 23 24 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 27 * PB-A8 on-board gic irq sources 34 28 */ ··· 58 64 #define IRQ_PBA8_USB (IRQ_PBA8_GIC_START + 29) /* USB controller */ 59 65 #define IRQ_PBA8_TSPEN (IRQ_PBA8_GIC_START + 30) /* Touchscreen pen */ 60 66 #define IRQ_PBA8_TSKPAD (IRQ_PBA8_GIC_START + 31) /* Touchscreen keypad */ 67 + 68 + #define IRQ_PBA8_PMU (IRQ_PBA8_GIC_START + 47) /* Cortex-A8 PMU */ 61 69 62 70 /* ... */ 63 71 #define IRQ_PBA8_PCI0 (IRQ_PBA8_GIC_START + 50)
+4 -10
arch/arm/mach-realview/include/mach/irqs-pbx.h
··· 22 22 23 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 26 * PBX on-board gic irq sources 33 27 */ ··· 71 77 #define IRQ_PBX_TIMER4_5 (IRQ_PBX_GIC_START + 41) /* Timer 0/1 (default timer) */ 72 78 #define IRQ_PBX_TIMER6_7 (IRQ_PBX_GIC_START + 42) /* Timer 2/3 */ 73 79 /* ... */ 74 - #define IRQ_PBX_PMU_CPU3 (IRQ_PBX_GIC_START + 44) /* CPU PMU Interrupts */ 75 - #define IRQ_PBX_PMU_CPU2 (IRQ_PBX_GIC_START + 45) 76 - #define IRQ_PBX_PMU_CPU1 (IRQ_PBX_GIC_START + 46) 77 - #define IRQ_PBX_PMU_CPU0 (IRQ_PBX_GIC_START + 47) 80 + #define IRQ_PBX_PMU_CPU0 (IRQ_PBX_GIC_START + 44) /* CPU PMU Interrupts */ 81 + #define IRQ_PBX_PMU_CPU1 (IRQ_PBX_GIC_START + 45) 82 + #define IRQ_PBX_PMU_CPU2 (IRQ_PBX_GIC_START + 46) 83 + #define IRQ_PBX_PMU_CPU3 (IRQ_PBX_GIC_START + 47) 78 84 79 85 /* ... */ 80 86 #define IRQ_PBX_PCI0 (IRQ_PBX_GIC_START + 50)