Skip to content

Commit

Permalink
ARM: imx: convert smp platforms to global gic_handle_irq()
Browse files Browse the repository at this point in the history
Convert the SMP imx platforms to use the global gic_handle_irq()
function instead a private function.

Cc: Sascha Hauer <kernel@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
  • Loading branch information
Marc Zyngier committed Nov 15, 2011
1 parent 562e002 commit fea9fe8
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 55 deletions.
1 change: 0 additions & 1 deletion arch/arm/plat-mxc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# Common support
obj-y := clock.o time.o devices.o cpu.o system.o irq-common.o

obj-$(CONFIG_ARM_GIC) += gic.o
obj-$(CONFIG_MXC_TZIC) += tzic.o
obj-$(CONFIG_MXC_AVIC) += avic.o

Expand Down
41 changes: 0 additions & 41 deletions arch/arm/plat-mxc/gic.c

This file was deleted.

3 changes: 1 addition & 2 deletions arch/arm/plat-mxc/include/mach/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ extern void imx_print_silicon_rev(const char *cpu, int srev);

void avic_handle_irq(struct pt_regs *);
void tzic_handle_irq(struct pt_regs *);
void mxc_gic_handle_irq(struct pt_regs *);

#define imx1_handle_irq avic_handle_irq
#define imx21_handle_irq avic_handle_irq
Expand All @@ -101,7 +100,7 @@ void mxc_gic_handle_irq(struct pt_regs *);
#define imx50_handle_irq tzic_handle_irq
#define imx51_handle_irq tzic_handle_irq
#define imx53_handle_irq tzic_handle_irq
#define imx6q_handle_irq mxc_gic_handle_irq
#define imx6q_handle_irq gic_handle_irq

extern void imx_enable_cpu(int cpu, bool enable);
extern void imx_set_cpu_jump(int cpu, void *jump_addr);
Expand Down
11 changes: 0 additions & 11 deletions arch/arm/plat-mxc/include/mach/entry-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,8 @@
* published by the Free Software Foundation.
*/

/* Unused, we use CONFIG_MULTI_IRQ_HANDLER */

.macro disable_fiq
.endm

.macro get_irqnr_preamble, base, tmp
.endm

.macro arch_ret_to_user, tmp1, tmp2
.endm

.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
.endm

.macro test_for_ipi, irqnr, irqstat, base, tmp
.endm

0 comments on commit fea9fe8

Please sign in to comment.