summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-spear3xx/include/mach/entry-macro.S
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-15 22:02:11 -0800
committerOlof Johansson <olof@lixom.net>2011-12-15 22:02:11 -0800
commit017c899c2db3da481cc174049e47307ed3aba530 (patch)
treed2e55932579421d0196ac63c45bad1de8dbfa5eb /arch/arm/mach-spear3xx/include/mach/entry-macro.S
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff)
parentc97136307c2cd336a3ee68cc0890b0f55d01d2d4 (diff)
Merge branch 'omap/soc' into next/soc
Diffstat (limited to 'arch/arm/mach-spear3xx/include/mach/entry-macro.S')
-rw-r--r--arch/arm/mach-spear3xx/include/mach/entry-macro.S27
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/mach-spear3xx/include/mach/entry-macro.S b/arch/arm/mach-spear3xx/include/mach/entry-macro.S
index 53da4224ba3..de3bb41c8e9 100644
--- a/arch/arm/mach-spear3xx/include/mach/entry-macro.S
+++ b/arch/arm/mach-spear3xx/include/mach/entry-macro.S
@@ -11,35 +11,8 @@
* warranty of any kind, whether express or implied.
*/
-#include <asm/hardware/vic.h>
-#include <mach/hardware.h>
-
.macro disable_fiq
.endm
- .macro get_irqnr_preamble, base, tmp
- .endm
-
.macro arch_ret_to_user, tmp1, tmp2
.endm
-
- .macro get_irqnr_and_base, irqnr, irqstat, base, tmp
- ldr \base, =VA_SPEAR3XX_ML1_VIC_BASE
- ldr \irqstat, [\base, #VIC_IRQ_STATUS] @ get status
- teq \irqstat, #0
- beq 1001f @ this will set/reset
- @ zero register
- /*
- * Following code will find bit position of least significang
- * bit set in irqstat, using following equation
- * least significant bit set in n = (n & ~(n-1))
- */
- sub \tmp, \irqstat, #1 @ tmp = irqstat - 1
- mvn \tmp, \tmp @ tmp = ~tmp
- and \irqstat, \irqstat, \tmp @ irqstat &= tmp
- /* Now, irqstat is = bit no. of 1st bit set in vic irq status */
- clz \tmp, \irqstat @ tmp = leading zeros
- rsb \irqnr, \tmp, #0x1F @ irqnr = 32 - tmp - 1
-
-1001: /* EQ will be set if no irqs pending */
- .endm