[PATCH_V2 08/34] MIPS: jz4740: allow interrupt controller probe via DT
From: Zubair Lutfullah Kakakhel <hidden>
Date: 2015-02-04 15:22:48
Also in:
linux-devicetree, linux-serial, lkml
Subsystem:
mips, the rest · Maintainers:
Thomas Bogendoerfer, Linus Torvalds
From: Paul Burton <redacted> Declare the interrupt controller for probe via the standard irqchip_init function. Signed-off-by: Paul Burton <redacted> Cc: Lars-Peter Clausen <lars@metafoo.de> --- arch/mips/jz4740/irq.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/arch/mips/jz4740/irq.c b/arch/mips/jz4740/irq.c
index 1b742c3..a4f0a82 100644
--- a/arch/mips/jz4740/irq.c
+++ b/arch/mips/jz4740/irq.c@@ -18,6 +18,7 @@ #include <linux/types.h> #include <linux/interrupt.h> #include <linux/ioport.h> +#include <linux/of_irq.h> #include <linux/timex.h> #include <linux/slab.h> #include <linux/delay.h>
@@ -29,6 +30,8 @@ #include <asm/mach-jz4740/base.h> +#include "../../drivers/irqchip/irqchip.h" + static void __iomem *jz_intc_base; #define JZ_REG_INTC_STATUS 0x00
@@ -74,7 +77,7 @@ static struct irqaction jz4740_cascade_action = { .name = "JZ4740 cascade interrupt", }; -void __init jz4740_intc_init(void) +static void __init __jz4740_intc_init(int parent_irq) { struct irq_chip_generic *gc; struct irq_chip_type *ct;
@@ -101,8 +104,27 @@ void __init jz4740_intc_init(void) irq_setup_generic_chip(gc, IRQ_MSK(32), 0, 0, IRQ_NOPROBE | IRQ_LEVEL); - setup_irq(2, &jz4740_cascade_action); + setup_irq(parent_irq, &jz4740_cascade_action); +} + +void __init jz4740_intc_init(void) +{ + __jz4740_intc_init(2); +} + +static int __init jz4740_intc_of_init(struct device_node *node, + struct device_node *parent) +{ + int parent_irq; + + parent_irq = irq_of_parse_and_map(node, 0); + if (!parent_irq) + return -EINVAL; + + __jz4740_intc_init(parent_irq); + return 0; } +IRQCHIP_DECLARE(jz4740_intc, "ingenic,jz4740-intc", jz4740_intc_of_init); #ifdef CONFIG_DEBUG_FS
--
1.9.1