Commit 4060bbe9 authored by Andrew Bresticker's avatar Andrew Bresticker Committed by Ralf Baechle

MIPS: Move gic.h to include/linux/irqchip/mips-gic.h

Now that the MIPS GIC irqchip lives in drivers/irqchip/, move
its header over to include/linux/irqchip/.
Signed-off-by: default avatarAndrew Bresticker <abrestic@chromium.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Qais Yousef <qais.yousef@imgtec.com>
Cc: John Crispin <blogic@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/8129/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 5f68fea0
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifndef _MIPS_MALTAINT_H #ifndef _MIPS_MALTAINT_H
#define _MIPS_MALTAINT_H #define _MIPS_MALTAINT_H
#include <asm/gic.h> #include <linux/irqchip/mips-gic.h>
/* /*
* Interrupts 0..15 are used for Malta ISA compatible interrupts * Interrupts 0..15 are used for Malta ISA compatible interrupts
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifndef _MIPS_SEAD3INT_H #ifndef _MIPS_SEAD3INT_H
#define _MIPS_SEAD3INT_H #define _MIPS_SEAD3INT_H
#include <asm/gic.h> #include <linux/irqchip/mips-gic.h>
/* SEAD-3 GIC address space definitions. */ /* SEAD-3 GIC address space definitions. */
#define GIC_BASE_ADDR 0x1b1c0000 #define GIC_BASE_ADDR 0x1b1c0000
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/irqchip/mips-gic.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/gic.h>
#include <asm/mips-boards/maltaint.h> #include <asm/mips-boards/maltaint.h>
DEFINE_PER_CPU(struct clock_event_device, gic_clockevent_device); DEFINE_PER_CPU(struct clock_event_device, gic_clockevent_device);
......
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/irqchip/mips-gic.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/cevt-r4k.h> #include <asm/cevt-r4k.h>
#include <asm/gic.h>
static int mips_next_event(unsigned long delta, static int mips_next_event(unsigned long delta,
struct clock_event_device *evt) struct clock_event_device *evt)
......
...@@ -6,10 +6,9 @@ ...@@ -6,10 +6,9 @@
* Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved.
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/time.h> #include <linux/time.h>
#include <asm/gic.h>
static cycle_t gic_hpt_read(struct clocksource *cs) static cycle_t gic_hpt_read(struct clocksource *cs)
{ {
return gic_read_count(); return gic_read_count();
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
...@@ -37,7 +38,6 @@ ...@@ -37,7 +38,6 @@
#include <asm/mipsmtregs.h> #include <asm/mipsmtregs.h>
#include <asm/mips_mt.h> #include <asm/mips_mt.h>
#include <asm/amon.h> #include <asm/amon.h>
#include <asm/gic.h>
static void cmp_init_secondary(void) static void cmp_init_secondary(void)
{ {
......
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
*/ */
#include <linux/io.h> #include <linux/io.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/bcache.h> #include <asm/bcache.h>
#include <asm/gic.h>
#include <asm/mips-cm.h> #include <asm/mips-cm.h>
#include <asm/mips-cpc.h> #include <asm/mips-cpc.h>
#include <asm/mips_mt.h> #include <asm/mips_mt.h>
......
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
* option) any later version. * option) any later version.
*/ */
#include <linux/irqchip/mips-gic.h>
#include <linux/printk.h> #include <linux/printk.h>
#include <asm/gic.h>
#include <asm/mips-cpc.h> #include <asm/mips-cpc.h>
#include <asm/smp-ops.h> #include <asm/smp-ops.h>
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/smp.h> #include <linux/smp.h>
...@@ -34,7 +35,6 @@ ...@@ -34,7 +35,6 @@
#include <asm/mipsregs.h> #include <asm/mipsregs.h>
#include <asm/mipsmtregs.h> #include <asm/mipsmtregs.h>
#include <asm/mips_mt.h> #include <asm/mips_mt.h>
#include <asm/gic.h>
static void __init smvp_copy_vpe_config(void) static void __init smvp_copy_vpe_config(void)
{ {
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/kernel_stat.h> #include <linux/kernel_stat.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/random.h> #include <linux/random.h>
...@@ -33,7 +34,6 @@ ...@@ -33,7 +34,6 @@
#include <asm/mips-boards/generic.h> #include <asm/mips-boards/generic.h>
#include <asm/mips-boards/msc01_pci.h> #include <asm/mips-boards/msc01_pci.h>
#include <asm/msc01_ic.h> #include <asm/msc01_ic.h>
#include <asm/gic.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/rtlx.h> #include <asm/rtlx.h>
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/timex.h> #include <linux/timex.h>
#include <linux/mc146818rtc.h> #include <linux/mc146818rtc.h>
...@@ -37,7 +38,6 @@ ...@@ -37,7 +38,6 @@
#include <asm/time.h> #include <asm/time.h>
#include <asm/mc146818-time.h> #include <asm/mc146818-time.h>
#include <asm/msc01_ic.h> #include <asm/msc01_ic.h>
#include <asm/gic.h>
#include <asm/mips-boards/generic.h> #include <asm/mips-boards/generic.h>
#include <asm/mips-boards/maltaint.h> #include <asm/mips-boards/maltaint.h>
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/irqchip/mips-gic.h>
#include <asm/gic.h>
#include <asm/mips-boards/sead3int.h> #include <asm/mips-boards/sead3int.h>
struct resource ehci_resources[] = { struct resource ehci_resources[] = {
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/io.h> #include <linux/io.h>
#include <asm/gic.h>
#include <asm/irq_cpu.h> #include <asm/irq_cpu.h>
#include <asm/setup.h> #include <asm/setup.h>
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/smsc911x.h> #include <linux/smsc911x.h>
#include <asm/gic.h>
#include <asm/mips-boards/sead3int.h> #include <asm/mips-boards/sead3int.h>
static struct smsc911x_platform_config sead3_smsc911x_data = { static struct smsc911x_platform_config sead3_smsc911x_data = {
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <asm/gic.h>
#include <asm/mips-boards/sead3int.h> #include <asm/mips-boards/sead3int.h>
#define UART(base) \ #define UART(base) \
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
* Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved. * Copyright (C) 2012 MIPS Technologies, Inc. All rights reserved.
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/irqchip/mips-gic.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/gic.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/irq.h> #include <asm/irq.h>
......
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
#include <linux/bitmap.h> #include <linux/bitmap.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irqchip/mips-gic.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/clocksource.h> #include <linux/clocksource.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/gic.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
......
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