4 files changed, 18 insertions, 98 deletions

diff --git a/arch/arm/mach-shmobile/include/mach/entry-macro-gic.S b/arch/arm/mach-shmobile/include/mach/entry-macro-gic.S
deleted file mode 100644
index 48872dd15269..000000000000
--- a/arch/arm/mach-shmobile/include/mach/entry-macro-gic.S
+++ /dev/null
@@ -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
diff --git a/arch/arm/mach-shmobile/include/mach/entry-macro-intc.S b/arch/arm/mach-shmobile/include/mach/entry-macro-intc.S
deleted file mode 100644
index f428c4db2b60..000000000000
--- a/arch/arm/mach-shmobile/include/mach/entry-macro-intc.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2010 Magnus Damm
- * Copyright (C) 2008 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/irqs.h>
-
-#define INTCA_BASE      0xe6980000
-#define INTFLGA_OFFS    0x00000018 /* accept pending interrupt */
-#define INTEVTA_OFFS    0x00000020 /* vector number of accepted interrupt */
-#define INTLVLA_OFFS    0x00000030 /* priority level of accepted interrupt */
-#define INTLVLB_OFFS    0x00000034 /* previous priority level */
-
-        .macro  disable_fiq
-        .endm
-
-        .macro  get_irqnr_preamble, base, tmp
-        ldr     \base, =INTCA_BASE
-        .endm
-
-        .macro  arch_ret_to_user, tmp1, tmp2
-        .endm
-
-        .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-        /* The single INTFLGA read access below results in the following:
-         *
-         * 1. INTLVLB is updated with old priority value from INTLVLA
-         * 2. Highest priority interrupt is accepted
-         * 3. INTLVLA is updated to contain priority of accepted interrupt
-         * 4. Accepted interrupt vector is stored in INTFLGA and INTEVTA
-         */
-        ldr     \irqnr, [\base, #INTFLGA_OFFS]
-
-        /* Restore INTLVLA with the value saved in INTLVLB.
-         * This is required to support interrupt priorities properly.
-         */
-        ldrb    \tmp, [\base, #INTLVLB_OFFS]
-        strb    \tmp, [\base, #INTLVLA_OFFS]
-
-        /* Handle invalid vector number case */
-        cmp     \irqnr, #0
-        beq     1000f
-
-        /* Convert vector to irq number, same as the evt2irq() macro */
-        lsr     \irqnr, \irqnr, #0x5
-        subs    \irqnr, \irqnr, #16
-
-1000:
-        .endm
diff --git a/arch/arm/mach-shmobile/include/mach/entry-macro.S b/arch/arm/mach-shmobile/include/mach/entry-macro.S
index 26e401167605..d791f10eeac7 100644
--- a/arch/arm/mach-shmobile/include/mach/entry-macro.S
+++ b/arch/arm/mach-shmobile/include/mach/entry-macro.S
@@ -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
diff --git a/arch/arm/mach-shmobile/include/mach/hardware.h b/arch/arm/mach-shmobile/include/mach/hardware.h
index 3f0ef194603e..99264a5ce5e4 100644
--- a/arch/arm/mach-shmobile/include/mach/hardware.h
+++ b/arch/arm/mach-shmobile/include/mach/hardware.h
@@ -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 */