Skip to content

Commit

Permalink
arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC
Browse files Browse the repository at this point in the history
entry-macro.S contains some stale code for chips before Tegra20 that
apparently didn't use an ARM GIC. All chips supported by mainline use
an ARM GIC, so rip out the stale code.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
  • Loading branch information
Stephen Warren authored and Olof Johansson committed Dec 8, 2011
1 parent 103c43a commit f5ce5e7
Showing 1 changed file with 0 additions and 23 deletions.
23 changes: 0 additions & 23 deletions arch/arm/mach-tegra/include/mach/entry-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <mach/iomap.h>
#include <mach/io.h>

#if defined(CONFIG_ARM_GIC)
#define HAVE_GET_IRQNR_PREAMBLE
#include <asm/hardware/entry-macro-gic.S>

Expand All @@ -32,25 +31,3 @@

.macro arch_ret_to_user, tmp1, tmp2
.endm
#else
/* legacy interrupt controller for AP16 */
.macro disable_fiq
.endm

.macro get_irqnr_preamble, base, tmp
@ enable imprecise aborts
cpsie a
@ EVP base at 0xf010f000
mov \base, #0xf0000000
orr \base, #0x00100000
orr \base, #0x0000f000
.endm

.macro arch_ret_to_user, tmp1, tmp2
.endm

.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
ldr \irqnr, [\base, #0x20] @ EVT_IRQ_STS
cmp \irqnr, #0x80
.endm
#endif

0 comments on commit f5ce5e7

Please sign in to comment.