evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MIPS: JZ4740: Move arch_init_irq out of arch/mips/jz4740/irq.c

Browse source 
In preparation for moving the JZ4740 interrupt controller driver to
drivers/irqchip, move arch_init_irq into setup.c such that everything
remaining in irq.c is related to said JZ4740 interrupt controller.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
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/10136/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Paul Burton 2015-05-24 16:11:19 +01:00 • committed by Ralf Baechle
parent 2974a35657
commit 0e81db8f5b
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/mips/include/asm/mach-jz4740/irq.h
View file

@ -54,4 +54,6 @@
#define NR_IRQS (JZ4740_IRQ_ADC_BASE + 6) #define NR_IRQS (JZ4740_IRQ_ADC_BASE + 6)
extern void __init jz4740_intc_init(void);
#endif #endif

5
arch/mips/jz4740/irq.c
View file

@ -18,7 +18,6 @@
#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.h>
#include <linux/timex.h> #include <linux/timex.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -78,13 +77,11 @@ static struct irqaction jz4740_cascade_action = {
.name = "JZ4740 cascade interrupt", .name = "JZ4740 cascade interrupt",
}; };
void __init arch_init_irq(void) void __init jz4740_intc_init(void)
{ {
struct irq_chip_generic *gc; struct irq_chip_generic *gc;
struct irq_chip_type *ct; struct irq_chip_type *ct;
irqchip_init();
jz_intc_base = ioremap(JZ4740_INTC_BASE_ADDR, 0x14); jz_intc_base = ioremap(JZ4740_INTC_BASE_ADDR, 0x14);
/* Mask all irqs */ /* Mask all irqs */

8
arch/mips/jz4740/setup.c
View file

@ -16,6 +16,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irqchip.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/of_fdt.h> #include <linux/of_fdt.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
@ -24,6 +25,7 @@
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/mach-jz4740/base.h> #include <asm/mach-jz4740/base.h>
#include <asm/mach-jz4740/irq.h>
#include "reset.h" #include "reset.h"
@ -78,3 +80,9 @@ const char *get_system_type(void)
{ {
return "JZ4740"; return "JZ4740";
} }
void __init arch_init_irq(void)
{
irqchip_init();
jz4740_intc_init();
}