Skip to contentSkip to conversation

ARM: mach-shmobile: Rely on run-time IRQ handlers

PATCH New Magnus Damm 1 participant 1 message Dec 28, 2010

Subsystems (4)
lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

PATCH 4/4 ARM: mach-shmobile: Rely on run-time IRQ handlers

From: Magnus Damm <[email protected]>

Remove now unused IRQ demux code. All R-Mobile and SH-Mobile processors should register IRQ demux handlers during run-time.

---

 arch/arm/mach-shmobile/include/mach/entry-macro-gic.S  |   29 -------
 arch/arm/mach-shmobile/include/mach/entry-macro-intc.S |   61 ----------------
 arch/arm/mach-shmobile/include/mach/entry-macro.S      |   23 ++++--
 arch/arm/mach-shmobile/include/mach/hardware.h         |    3 
 4 files changed, 18 insertions(+), 98 deletions(-)
arch/arm/mach-shmobile/include/mach/entry-macro-gic.S deleted +0 -29
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2010 Renesas Solutions Corp.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#include <mach/hardware.h>
-#include <asm/hardware/gic.h>
-#include <asm/hardware/entry-macro-gic.S>
-
-	.macro  disable_fiq
-	.endm
-
-	.macro	get_irqnr_preamble, base, tmp
-	ldr	\base, =(0xf0000100)
-	.endm
-
-	.macro  arch_ret_to_user, tmp1, tmp2
-	.endm
arch/arm/mach-shmobile/include/mach/entry-macro-intc.S deleted +0 -61

61 lines not on this page · raw message

arch/arm/mach-shmobile/include/mach/entry-macro.S +18 -5
@@ -14,8 +14,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#if defined(CONFIG_ARM_GIC)
-#include <mach/entry-macro-gic.S>
-#else
-#include <mach/entry-macro-intc.S>
-#endif
+
+	.macro  disable_fiq
+	.endm
+
+	.macro  get_irqnr_preamble, base, tmp
+	.endm
+
+	.macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
+	.endm
+
+	.macro  test_for_ipi, irqnr, irqstat, base, tmp
+	.endm
+
+	.macro  test_for_ltirq, irqnr, irqstat, base, tmp
+	.endm
+
+	.macro  arch_ret_to_user, tmp1, tmp2
+	.endm
arch/arm/mach-shmobile/include/mach/hardware.h +0 -3
@@ -1,7 +1,4 @@
 #ifndef __ASM_MACH_HARDWARE_H
 #define __ASM_MACH_HARDWARE_H
 
-/* INTFLGA register - used by low level interrupt code in entry-macro.S */
-#define INTFLGA			0xe6980018
-
 #endif /* __ASM_MACH_HARDWARE_H */