ARM: mach-shmobile: update for GIC changes.
This fixes up the SMP support to use the refactored GIC APIs.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
diff --git a/arch/arm/mach-shmobile/entry-gic.S b/arch/arm/mach-shmobile/entry-gic.S
index 6e4fa47..e20239b 100644
--- a/arch/arm/mach-shmobile/entry-gic.S
+++ b/arch/arm/mach-shmobile/entry-gic.S
@@ -2,19 +2,17 @@
* ARM Interrupt demux handler using GIC
*
* Copyright (C) 2010 Magnus Damm
- * Copyright (C) 2010 Renesas Solutions Corp.
+ * Copyright (C) 2011 Paul Mundt
+ * Copyright (C) 2010 - 2011 Renesas Solutions Corp.
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
+#include <asm/assembler.h>
#include <asm/entry-macro-multi.S>
#include <asm/hardware/gic.h>
#include <asm/hardware/entry-macro-gic.S>
- .macro get_irqnr_preamble, base, tmp
- ldr \base, =(0xf0000100)
- .endm
-
arch_irq_handler shmobile_handle_irq_gic
diff --git a/arch/arm/mach-shmobile/include/mach/smp.h b/arch/arm/mach-shmobile/include/mach/smp.h
index f4a35ff..50db94e 100644
--- a/arch/arm/mach-shmobile/include/mach/smp.h
+++ b/arch/arm/mach-shmobile/include/mach/smp.h
@@ -2,15 +2,15 @@
#define __MACH_SMP_H
#include <asm/hardware/gic.h>
-#include <asm/smp_mpidr.h>
/*
* We use IRQ1 as the IPI
*/
-static inline void smp_cross_call(const struct cpumask *mask)
+static inline void smp_cross_call(const struct cpumask *mask, int ipi)
{
#if defined(CONFIG_ARM_GIC)
- gic_raise_softirq(mask, 1);
+ gic_raise_softirq(mask, ipi);
#endif
}
+
#endif
diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c
index 5af2be0..322d8d5 100644
--- a/arch/arm/mach-shmobile/intc-sh73a0.c
+++ b/arch/arm/mach-shmobile/intc-sh73a0.c
@@ -252,10 +252,10 @@
void __init sh73a0_init_irq(void)
{
+ void __iomem *gic_base = __io(0xf0001000);
void __iomem *intevtsa = ioremap_nocache(0xffd20100, PAGE_SIZE);
- gic_dist_init(0, __io(0xf0001000), 29);
- gic_cpu_init(0, __io(0xf0000100));
+ gic_init(0, 29, gic_base, gic_base);
register_intc_controller(&intcs_desc);
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index 4e71fd4..a156d21 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -64,7 +64,7 @@
void __cpuinit sh73a0_secondary_init(unsigned int cpu)
{
- gic_cpu_init(0, __io(0xf0000100));
+ gic_secondary_init(0);
}
int __cpuinit sh73a0_boot_secondary(unsigned int cpu)