Commit a83d8e27 authored by Marc Zyngier's avatar Marc Zyngier

ARM: shmobile: convert smp platforms to gic_handle_irq()

Convert the SMP shmobile platforms to use gic_handle_irq() instead
of the assembly macro.

Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent bbf5f385
...@@ -28,7 +28,6 @@ pfc-$(CONFIG_ARCH_SH73A0) += pfc-sh73a0.o ...@@ -28,7 +28,6 @@ pfc-$(CONFIG_ARCH_SH73A0) += pfc-sh73a0.o
obj-$(CONFIG_ARCH_SH7367) += entry-intc.o obj-$(CONFIG_ARCH_SH7367) += entry-intc.o
obj-$(CONFIG_ARCH_SH7377) += entry-intc.o obj-$(CONFIG_ARCH_SH7377) += entry-intc.o
obj-$(CONFIG_ARCH_SH7372) += entry-intc.o obj-$(CONFIG_ARCH_SH7372) += entry-intc.o
obj-$(CONFIG_ARCH_SH73A0) += entry-gic.o
# PM objects # PM objects
obj-$(CONFIG_SUSPEND) += suspend.o obj-$(CONFIG_SUSPEND) += suspend.o
......
...@@ -608,7 +608,7 @@ struct sys_timer ag5evm_timer = { ...@@ -608,7 +608,7 @@ struct sys_timer ag5evm_timer = {
MACHINE_START(AG5EVM, "ag5evm") MACHINE_START(AG5EVM, "ag5evm")
.map_io = ag5evm_map_io, .map_io = ag5evm_map_io,
.init_irq = sh73a0_init_irq, .init_irq = sh73a0_init_irq,
.handle_irq = shmobile_handle_irq_gic, .handle_irq = gic_handle_irq,
.init_machine = ag5evm_init, .init_machine = ag5evm_init,
.timer = &ag5evm_timer, .timer = &ag5evm_timer,
MACHINE_END MACHINE_END
...@@ -448,7 +448,7 @@ struct sys_timer kota2_timer = { ...@@ -448,7 +448,7 @@ struct sys_timer kota2_timer = {
MACHINE_START(KOTA2, "kota2") MACHINE_START(KOTA2, "kota2")
.map_io = kota2_map_io, .map_io = kota2_map_io,
.init_irq = kota2_init_irq, .init_irq = kota2_init_irq,
.handle_irq = shmobile_handle_irq_gic, .handle_irq = gic_handle_irq,
.init_machine = kota2_init, .init_machine = kota2_init,
.timer = &kota2_timer, .timer = &kota2_timer,
MACHINE_END MACHINE_END
/*
* ARM Interrupt demux handler using GIC
*
* Copyright (C) 2010 Magnus Damm
* 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>
arch_irq_handler shmobile_handle_irq_gic
...@@ -7,7 +7,6 @@ extern void shmobile_secondary_vector(void); ...@@ -7,7 +7,6 @@ extern void shmobile_secondary_vector(void);
struct clk; struct clk;
extern int clk_init(void); extern int clk_init(void);
extern void shmobile_handle_irq_intc(struct pt_regs *); extern void shmobile_handle_irq_intc(struct pt_regs *);
extern void shmobile_handle_irq_gic(struct pt_regs *);
extern struct platform_suspend_ops shmobile_suspend_ops; extern struct platform_suspend_ops shmobile_suspend_ops;
struct cpuidle_driver; struct cpuidle_driver;
extern void (*shmobile_cpuidle_modes[])(void); extern void (*shmobile_cpuidle_modes[])(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment