leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MIPS/IRQCHIP: Move Ingenic SoC intc driver to drivers/irqchip

Browse Source 
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>
This commit is contained in:
Paul Burton 2015-05-24 16:11:31 +01:00 committed by Ralf Baechle
parent 24ccfa06b7
commit 44e08e7099
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/jz4740/Makefile
View File

@ -4,7 +4,7 @@
# Object file lists. # 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 gpio.o clock.o platform.o timer.o serial.o
obj-$(CONFIG_DEBUG_FS) += clock-debugfs.o obj-$(CONFIG_DEBUG_FS) += clock-debugfs.o

3
arch/mips/jz4740/gpio.c
View File

@ -21,6 +21,7 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irqchip/ingenic.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
@ -28,8 +29,6 @@
#include <asm/mach-jz4740/base.h> #include <asm/mach-jz4740/base.h>
#include "irq.h"
#define JZ4740_GPIO_BASE_A (32*0) #define JZ4740_GPIO_BASE_A (32*0)
#define JZ4740_GPIO_BASE_B (32*1) #define JZ4740_GPIO_BASE_B (32*1)
#define JZ4740_GPIO_BASE_C (32*2) #define JZ4740_GPIO_BASE_C (32*2)

5
drivers/irqchip/Kconfig
View File

@ -163,3 +163,8 @@ config KEYSTONE_IRQ
config MIPS_GIC config MIPS_GIC
bool bool
select MIPS_CM select MIPS_CM
config INGENIC_IRQ
bool
depends on MACH_INGENIC
default y

1
drivers/irqchip/Makefile
View File

@ -48,3 +48,4 @@ obj-$(CONFIG_KEYSTONE_IRQ) += irq-keystone.o
obj-$(CONFIG_MIPS_GIC) += irq-mips-gic.o obj-$(CONFIG_MIPS_GIC) += irq-mips-gic.o
obj-$(CONFIG_ARCH_MEDIATEK) += irq-mtk-sysirq.o obj-$(CONFIG_ARCH_MEDIATEK) += irq-mtk-sysirq.o
obj-$(CONFIG_ARCH_DIGICOLOR) += irq-digicolor.o obj-$(CONFIG_ARCH_DIGICOLOR) += irq-digicolor.o
obj-$(CONFIG_INGENIC_IRQ) += irq-ingenic.o

5
arch/mips/jz4740/irq.c → drivers/irqchip/irq-ingenic.c
View File

@ -18,6 +18,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/irqchip/ingenic.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/timex.h> #include <linux/timex.h>
@ -27,9 +28,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/mach-jz4740/irq.h> #include <asm/mach-jz4740/irq.h>
#include "irq.h" #include "irqchip.h"
#include "../../drivers/irqchip/irqchip.h"
struct ingenic_intc_data { struct ingenic_intc_data {
void __iomem *base; void __iomem *base;

4
arch/mips/jz4740/irq.h → include/linux/irqchip/ingenic.h
View File

@ -12,8 +12,8 @@
* *
*/ */
#ifndef __MIPS_JZ4740_IRQ_H__ #ifndef __LINUX_IRQCHIP_INGENIC_H__
#define __MIPS_JZ4740_IRQ_H__ #define __LINUX_IRQCHIP_INGENIC_H__
#include <linux/irq.h> #include <linux/irq.h>