summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-06-19 21:34:37 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-09 11:18:28 -0700
commite72e686bc5ada94c4832967c4f31219b3d55a9ad (patch)
treee1e2d3a5578e114fe1d16ee00f737aae1cd8e12f
parent349908f43bdc379bffc2e112b84572d2fc11765d (diff)
downloadlinux-stable-e72e686bc5ada94c4832967c4f31219b3d55a9ad.tar.gz
linux-stable-e72e686bc5ada94c4832967c4f31219b3d55a9ad.tar.bz2
linux-stable-e72e686bc5ada94c4832967c4f31219b3d55a9ad.zip
irqchip: spear_shirq: Fix interrupt offset
commit 4f4366033945419b0c52118c29d3057d7c558765 upstream. The ras3 block on spear320 claims to have 3 interrupts. In fact it has one and 6 reserved interrupts. Account the 6 reserved to this block so it has 7 interrupts total. That matches the datasheet and the device tree entries. Broken since commit 80515a5a(ARM: SPEAr3xx: shirq: simplify and move the shared irq multiplexor to DT). Testing is overrated.... Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/20140619212712.872379208@linutronix.de Fixes: 80515a5a2e3c ('ARM: SPEAr3xx: shirq: simplify and move the shared irq multiplexor to DT') Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/irqchip/spear-shirq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/spear-shirq.c b/drivers/irqchip/spear-shirq.c
index 8527743b5cef..391b9cea73ed 100644
--- a/drivers/irqchip/spear-shirq.c
+++ b/drivers/irqchip/spear-shirq.c
@@ -125,7 +125,7 @@ static struct spear_shirq spear320_shirq_ras2 = {
};
static struct spear_shirq spear320_shirq_ras3 = {
- .irq_nr = 3,
+ .irq_nr = 7,
.irq_bit_off = 0,
.invalid_irq = 1,
.regs = {