[PATCH_V2 09/34] MIPS: jz4740: probe interrupt controller via DT
From: Zubair Lutfullah Kakakhel <hidden>
Date: 2015-02-04 15:22:43
Also in:
linux-devicetree, linux-serial, lkml
Subsystem:
mips, the rest · Maintainers:
Thomas Bogendoerfer, Linus Torvalds
From: Paul Burton <redacted> Add the appropriate DT node to probe the interrupt controller driver using the devicetree, and remove the call to jz4740_intc_init. Signed-off-by: Paul Burton <redacted> Cc: Lars-Peter Clausen <lars@metafoo.de> --- arch/mips/boot/dts/jz4740.dtsi | 11 +++++++++++ arch/mips/jz4740/setup.c | 2 -- 2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/mips/boot/dts/jz4740.dtsi b/arch/mips/boot/dts/jz4740.dtsi
index 2d64765c..3841024 100644
--- a/arch/mips/boot/dts/jz4740.dtsi
+++ b/arch/mips/boot/dts/jz4740.dtsi@@ -9,4 +9,15 @@ interrupt-controller; compatible = "mti,cpu-interrupt-controller"; }; + + intc: intc@10001000 { + compatible = "ingenic,jz4740-intc"; + reg = <0x10001000 0x14>; + + interrupt-controller; + #interrupt-cells = <1>; + + interrupt-parent = <&cpuintc>; + interrupts = <2>; + }; };
diff --git a/arch/mips/jz4740/setup.c b/arch/mips/jz4740/setup.c
index 4808730..8c08d7d 100644
--- a/arch/mips/jz4740/setup.c
+++ b/arch/mips/jz4740/setup.c@@ -25,7 +25,6 @@ #include <asm/prom.h> #include <asm/mach-jz4740/base.h> -#include <asm/mach-jz4740/irq.h> #include "reset.h"
@@ -84,5 +83,4 @@ const char *get_system_type(void) void __init arch_init_irq(void) { irqchip_init(); - jz4740_intc_init(); }
--
1.9.1