summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/include/mach/entry-macro.S
diff options
context:
space:
mode:
authorMarc Zyngier <maz@misterjones.org>2008-09-01 13:03:32 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-09-01 17:13:26 +0100
commit57a7a62eb65b35f51814382b0841ff99be242880 (patch)
tree9cdabcea5ed96a33b26f58430b0b3c36257670cb /arch/arm/mach-pxa/include/mach/entry-macro.S
parent7a5063d86e95774ada66baac58fdfb7a80c75180 (diff)
[ARM] 5233/1: Allow PXA to have ISA IRQs numbered 0-15
Allow PXA IRQs to be numbered starting at 16, leaving 0 to 15 for the ISA IRQs, if needed. This patch depends on RMK's PXA_HAVE_BOARD_IRQS patch. Signed-off-by: Marc Zyngier <marc.zyngier@altran.com> Acked-by: Russel King <linux@arm.linux.org.uk> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/entry-macro.S')
-rw-r--r--arch/arm/mach-pxa/include/mach/entry-macro.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/include/mach/entry-macro.S b/arch/arm/mach-pxa/include/mach/entry-macro.S
index de16c12d523..f6b4bf3e73d 100644
--- a/arch/arm/mach-pxa/include/mach/entry-macro.S
+++ b/arch/arm/mach-pxa/include/mach/entry-macro.S
@@ -41,7 +41,7 @@
and \irqstat, \irqstat, \irqnr
clz \irqnr, \irqstat
rsb \irqnr, \irqnr, #31
- add \irqnr, \irqnr, #32
+ add \irqnr, \irqnr, #(32 + PXA_IRQ(0))
b 1001f
1003:
mrc p6, 0, \irqstat, c0, c0, 0 @ ICIP
@@ -52,6 +52,6 @@
rsb \irqstat, \irqnr, #0
and \irqstat, \irqstat, \irqnr
clz \irqnr, \irqstat
- rsb \irqnr, \irqnr, #31
+ rsb \irqnr, \irqnr, #(31 + PXA_IRQ(0))
1001:
.endm