diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2015-05-24 16:11:31 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-06-21 21:53:10 +0200 |
| commit | 44e08e7099c8de226606cfc989b45d6fa27f507f (patch) | |
| tree | 6e547e1b00091f0ce730848faa0b8df8957ed329 | |
| parent | 24ccfa06b7ea3c3f7f53f6bac9425d604ebce470 (diff) | |
| download | linux-44e08e7099c8de226606cfc989b45d6fa27f507f.tar.bz2 | |
MIPS/IRQCHIP: Move Ingenic SoC intc driver to drivers/irqchip
Move the driver for Ingenic SoC interrupt controllers into
drivers/irqchip where it belongs.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: Brian Norris <computersforpeace@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/10147/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/jz4740/Makefile | 2 | ||||
| -rw-r--r-- | arch/mips/jz4740/gpio.c | 3 | ||||
| -rw-r--r-- | drivers/irqchip/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/irqchip/Makefile | 1 | ||||
| -rw-r--r-- | drivers/irqchip/irq-ingenic.c (renamed from arch/mips/jz4740/irq.c) | 5 | ||||
| -rw-r--r-- | include/linux/irqchip/ingenic.h (renamed from arch/mips/jz4740/irq.h) | 4 |
6 files changed, 12 insertions, 8 deletions
diff --git a/arch/mips/jz4740/Makefile b/arch/mips/jz4740/Makefile index 28e5535dfa9e..6cf5dd42fa34 100644 --- a/arch/mips/jz4740/Makefile +++ b/arch/mips/jz4740/Makefile @@ -4,7 +4,7 @@ # Object file lists. -obj-y += prom.o irq.o time.o reset.o setup.o \ +obj-y += prom.o time.o reset.o setup.o \ gpio.o clock.o platform.o timer.o serial.o obj-$(CONFIG_DEBUG_FS) += clock-debugfs.o diff --git a/arch/mips/jz4740/gpio.c b/arch/mips/jz4740/gpio.c index 994a7dfe6f22..54c80d42a88d 100644 --- a/arch/mips/jz4740/gpio.c +++ b/arch/mips/jz4740/gpio.c @@ -21,6 +21,7 @@ #include <linux/gpio.h> #include <linux/delay.h> #include <linux/interrupt.h> +#include <linux/irqchip/ingenic.h> #include <linux/bitops.h> #include <linux/debugfs.h> @@ -28,8 +29,6 @@ #include <asm/mach-jz4740/base.h> -#include "irq.h" - #define JZ4740_GPIO_BASE_A (32*0) #define JZ4740_GPIO_BASE_B (32*1) #define JZ4740_GPIO_BASE_C (32*2) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 2b7531e0e84c..746daf37454c 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -163,3 +163,8 @@ config KEYSTONE_IRQ config MIPS_GIC bool select MIPS_CM + +config INGENIC_IRQ + bool + depends on MACH_INGENIC + default y diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index 129cde1ff5a7..db014e8e12c9 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -48,3 +48,4 @@ obj-$(CONFIG_KEYSTONE_IRQ) += irq-keystone.o obj-$(CONFIG_MIPS_GIC) += irq-mips-gic.o obj-$(CONFIG_ARCH_MEDIATEK) += irq-mtk-sysirq.o obj-$(CONFIG_ARCH_DIGICOLOR) += irq-digicolor.o +obj-$(CONFIG_INGENIC_IRQ) += irq-ingenic.o diff --git a/arch/mips/jz4740/irq.c b/drivers/irqchip/irq-ingenic.c index 64b4c3639280..005de3f932ae 100644 --- a/arch/mips/jz4740/irq.c +++ b/drivers/irqchip/irq-ingenic.c @@ -18,6 +18,7 @@ #include <linux/types.h> #include <linux/interrupt.h> #include <linux/ioport.h> +#include <linux/irqchip/ingenic.h> #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/timex.h> @@ -27,9 +28,7 @@ #include <asm/io.h> #include <asm/mach-jz4740/irq.h> -#include "irq.h" - -#include "../../drivers/irqchip/irqchip.h" +#include "irqchip.h" struct ingenic_intc_data { void __iomem *base; diff --git a/arch/mips/jz4740/irq.h b/include/linux/irqchip/ingenic.h index 601d5274ac69..0ee319a4029d 100644 --- a/arch/mips/jz4740/irq.h +++ b/include/linux/irqchip/ingenic.h @@ -12,8 +12,8 @@ * */ -#ifndef __MIPS_JZ4740_IRQ_H__ -#define __MIPS_JZ4740_IRQ_H__ +#ifndef __LINUX_IRQCHIP_INGENIC_H__ +#define __LINUX_IRQCHIP_INGENIC_H__ #include <linux/irq.h> |