Skip to contentSkip to conversation

arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC

PATCH New Stephen Warren 2 participants 2 messages Nov 2, 2011 – Dec 8, 2011

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC

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.

---
 arch/arm/mach-tegra/include/mach/entry-macro.S |   23 -----------------------
 1 files changed, 0 insertions(+), 23 deletions(-)
arch/arm/mach-tegra/include/mach/entry-macro.S +0 -23
index dd165c5..485a11e 100644
@@ -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>
 
@@ -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
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC

Quoted 5 lines · Stephen Warren

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.

Thanks, applied to for-3.3/cleanup

-Olof