diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-07-01 13:01:03 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-07-01 13:01:03 -0700 |
| commit | 375d610ff54e98e161abc7eba71bb80c2cf9a106 (patch) | |
| tree | dfcc254ccc9f98dce664f5e5b2d3a5b02bf6b4c2 /arch/arm/mach-dove/irq.c | |
| parent | b72802c3117417ab696b0764d6e3cea369f578a6 (diff) | |
| parent | 5d6bed2a9c8bc161bff4cc7cede00f2e0e27a7e7 (diff) | |
| download | op-kernel-dev-375d610ff54e98e161abc7eba71bb80c2cf9a106.zip op-kernel-dev-375d610ff54e98e161abc7eba71bb80c2cf9a106.tar.gz | |
Merge tag 'mvebu-fixes-4.2-0' of git://git.infradead.org/linux-mvebu into next/late
Merge "ARM: mvebu: fixes for v4.2" from Gregory Clement:
mvebu fixes for 4.2 (part 0)
Fix legacy dove IRQ numbers
* tag 'mvebu-fixes-4.2-0' of git://git.infradead.org/linux-mvebu:
ARM: dove: fix legacy dove IRQ numbers
ARM: mvebu: fix suspend to RAM on big-endian configurations
Diffstat (limited to 'arch/arm/mach-dove/irq.c')
| -rw-r--r-- | arch/arm/mach-dove/irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-dove/irq.c b/arch/arm/mach-dove/irq.c index 4a5a7ae..df0223f 100644 --- a/arch/arm/mach-dove/irq.c +++ b/arch/arm/mach-dove/irq.c @@ -126,14 +126,14 @@ __exception_irq_entry dove_legacy_handle_irq(struct pt_regs *regs) stat = readl_relaxed(dove_irq_base + IRQ_CAUSE_LOW_OFF); stat &= readl_relaxed(dove_irq_base + IRQ_MASK_LOW_OFF); if (stat) { - unsigned int hwirq = __fls(stat); + unsigned int hwirq = 1 + __fls(stat); handle_IRQ(hwirq, regs); return; } stat = readl_relaxed(dove_irq_base + IRQ_CAUSE_HIGH_OFF); stat &= readl_relaxed(dove_irq_base + IRQ_MASK_HIGH_OFF); if (stat) { - unsigned int hwirq = 32 + __fls(stat); + unsigned int hwirq = 33 + __fls(stat); handle_IRQ(hwirq, regs); return; } @@ -144,8 +144,8 @@ void __init dove_init_irq(void) { int i; - orion_irq_init(0, IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF); - orion_irq_init(32, IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF); + orion_irq_init(1, IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF); + orion_irq_init(33, IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF); #ifdef CONFIG_MULTI_IRQ_HANDLER set_handle_irq(dove_legacy_handle_irq); |
