Merge tag 'davinci-v3.6-fixes' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical

DaVinci fixes for v3.6

Fix an interrupt handling issue with cp_intc which
was causing occasional spurious interrupts with DA850 EVM

* tag 'davinci-v3.6-fixes' of git://gitorious.org/linux-davinci/linux-davinci:
  ARM: davinci: da8xx: fix interrupt handling

1 files changed, 3 insertions, 5 deletions

diff --git a/arch/arm/mach-davinci/include/mach/entry-macro.S b/arch/arm/mach-davinci/include/mach/entry-macro.S
index 768b3c060214..cf5f573eb5fd 100644
--- a/arch/arm/mach-davinci/include/mach/entry-macro.S
+++ b/arch/arm/mach-davinci/include/mach/entry-macro.S
@@ -30,12 +30,10 @@
 #endif
 #if defined(CONFIG_CP_INTC)
 1001:           ldr \irqnr, [\base, #0x80] /* get irq number */
+                mov \tmp, \irqnr, lsr #31
                 and \irqnr, \irqnr, #0xff  /* irq is in bits 0-9 */
-                mov \tmp, \irqnr, lsr #3
-                and \tmp, \tmp, #0xfc
-                add \tmp, \tmp, #0x280 /* get the register offset */
-                ldr \irqstat, [\base, \tmp] /* get the intc status */
-                cmp \irqstat, #0x0
+                and \tmp, \tmp, #0x1
+                cmp \tmp, #0x1
 #endif
 1002:
                 .endm