Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

[pandora-kernel.git] / arch / arm / mach-omap2 / include / mach / entry-macro.S

diff --git a/arch/arm/mach-omap2/include/mach/entry-macro.S b/arch/arm/mach-omap2/include/mach/entry-macro.S
index 81985a6..a48690b 100644 (file)
--- a/arch/arm/mach-omap2/include/mach/entry-macro.S
+++ b/arch/arm/mach-omap2/include/mach/entry-macro.S
@@ -61,6 +61,14 @@
                bne     9998f
                ldr     \irqnr, [\base, #0xd8] /* IRQ pending reg 3 */
                cmp     \irqnr, #0x0
+               bne     9998f
+
+               /*
+                * ti816x has additional IRQ pending register. Checking this
+                * register on omap2 & omap3 has no effect (read as 0).
+                */
+               ldr     \irqnr, [\base, #0xf8] /* IRQ pending reg 4 */
+               cmp     \irqnr, #0x0
 9998:
                ldrne   \irqnr, [\base, #INTCPS_SIR_IRQ_OFFSET]
                and     \irqnr, \irqnr, #ACTIVEIRQ_MASK /* Clear spurious bits */
@@ -133,6 +141,11 @@
                bne     9999f
                ldr     \irqnr, [\base, #0xd8] /* IRQ pending reg 3 */
                cmp     \irqnr, #0x0
+#ifdef CONFIG_SOC_OMAPTI816X
+               bne     9999f
+               ldr     \irqnr, [\base, #0xf8] /* IRQ pending reg 4 */
+               cmp     \irqnr, #0x0
+#endif
 9999:
                ldrne   \irqnr, [\base, #INTCPS_SIR_IRQ_OFFSET]
                and     \irqnr, \irqnr, #ACTIVEIRQ_MASK /* Clear spurious bits */