Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44e08e70 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

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: default avatarPaul 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent 24ccfa06

arch/mips/jz4740/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/mips/jz4740/gpio.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

drivers/irqchip/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -163,3 +163,8 @@ config KEYSTONE_IRQ 
config MIPS_GIC

	bool

	select MIPS_CM



config INGENIC_IRQ

	bool

	depends on MACH_INGENIC

	default y

drivers/irqchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

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

+2 −3
Original line number Diff line number Diff line
@@ -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;