diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-21 10:27:34 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-21 10:27:34 -0400 |
| commit | 2cbe23e3a432e3d09a849adb197c8fcc09e7391d (patch) | |
| tree | 711fe5845c4c7e7eaf8c57a597d86c0f9dda5b06 /arch/arm/include/asm/hardware | |
| parent | b2f1df8d2fc14bf7e6d9d967043d4b60c2efd8dc (diff) | |
| parent | ed1b4acc43b0c3289faa30cf184f322ab70a5be3 (diff) | |
Merge branch 'tegra/cleanups' into next/timer
Conflicts:
arch/arm/mach-tegra/Makefile
arch/arm/mach-vexpress/core.h
The tegra Makefile was changed in four different branches
in the same line. This merge should reduce the amount
of churn.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/include/asm/hardware')
| -rw-r--r-- | arch/arm/include/asm/hardware/entry-macro-iomd.S | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/include/asm/hardware/entry-macro-iomd.S b/arch/arm/include/asm/hardware/entry-macro-iomd.S index e0af4983723f..8c215acd9b57 100644 --- a/arch/arm/include/asm/hardware/entry-macro-iomd.S +++ b/arch/arm/include/asm/hardware/entry-macro-iomd.S | |||
| @@ -11,14 +11,6 @@ | |||
| 11 | /* IOC / IOMD based hardware */ | 11 | /* IOC / IOMD based hardware */ |
| 12 | #include <asm/hardware/iomd.h> | 12 | #include <asm/hardware/iomd.h> |
| 13 | 13 | ||
| 14 | .macro disable_fiq | ||
| 15 | mov r12, #ioc_base_high | ||
| 16 | .if ioc_base_low | ||
| 17 | orr r12, r12, #ioc_base_low | ||
| 18 | .endif | ||
| 19 | strb r12, [r12, #0x38] @ Disable FIQ register | ||
| 20 | .endm | ||
| 21 | |||
| 22 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | 14 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp |
| 23 | ldrb \irqstat, [\base, #IOMD_IRQREQB] @ get high priority first | 15 | ldrb \irqstat, [\base, #IOMD_IRQREQB] @ get high priority first |
| 24 | ldr \tmp, =irq_prio_h | 16 | ldr \tmp, =irq_prio_h |