summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-versatile/include
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-09-27 20:46:10 +0100
committerMarc Zyngier <marc.zyngier@arm.com>2011-11-15 18:14:04 +0000
commitc8be7acd63ed65aa034fc036bb2c7867f30561bd (patch)
tree853760ba378dfdf4685e8207b63bb9461370f5db /arch/arm/mach-versatile/include
parentb7378eafb3c478824146977022889c97f077bbd5 (diff)
downloadlinux-c8be7acd63ed65aa034fc036bb2c7867f30561bd.tar.gz
linux-c8be7acd63ed65aa034fc036bb2c7867f30561bd.tar.bz2
linux-c8be7acd63ed65aa034fc036bb2c7867f30561bd.zip
ARM: versatile: convert to MULTI_IRQ_HANDLER
Now that there is a generic IRQ handler for multiple VIC devices use it for versatile to help building multi platform kernels. Cc: Russell King <linux@arm.linux.org.uk> Tested-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Diffstat (limited to 'arch/arm/mach-versatile/include')
-rw-r--r--arch/arm/mach-versatile/include/mach/entry-macro.S30
1 files changed, 0 insertions, 30 deletions
diff --git a/arch/arm/mach-versatile/include/mach/entry-macro.S b/arch/arm/mach-versatile/include/mach/entry-macro.S
index e6f7c1663160..b6f0dbf122ee 100644
--- a/arch/arm/mach-versatile/include/mach/entry-macro.S
+++ b/arch/arm/mach-versatile/include/mach/entry-macro.S
@@ -7,39 +7,9 @@
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
-#include <mach/hardware.h>
-#include <mach/platform.h>
-#include <asm/hardware/vic.h>
.macro disable_fiq
.endm
- .macro get_irqnr_preamble, base, tmp
- ldr \base, =IO_ADDRESS(VERSATILE_VIC_BASE)
- .endm
-
.macro arch_ret_to_user, tmp1, tmp2
.endm
-
- .macro get_irqnr_and_base, irqnr, irqstat, base, tmp
- ldr \irqstat, [\base, #VIC_IRQ_STATUS] @ get masked status
- mov \irqnr, #0
- teq \irqstat, #0
- beq 1003f
-
-1001: tst \irqstat, #15
- bne 1002f
- add \irqnr, \irqnr, #4
- movs \irqstat, \irqstat, lsr #4
- bne 1001b
-1002: tst \irqstat, #1
- bne 1003f
- add \irqnr, \irqnr, #1
- movs \irqstat, \irqstat, lsr #1
- bne 1002b
-1003: /* EQ will be set if no irqs pending */
-
-@ clz \irqnr, \irqstat
-@1003: /* EQ will be set if we reach MAXIRQNUM */
- .endm
-