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

Commit 8e8261eb authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle
Browse files

MIPS: JZ4740: probe CPU interrupt controller via DT 



Use the generic irqchip_init function to probe irqchip drivers using DT,
and add the appropriate node to the JZ4740 devicetree in place of the
call to mips_cpu_irq_init.

Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Patchwork: https://patchwork.linux-mips.org/patch/10166/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 892b8cf0

arch/mips/boot/dts/ingenic/jz4740.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -2,4 +2,11 @@ 
	#address-cells = <1>;

	#size-cells = <1>;

	compatible = "ingenic,jz4740";



	cpuintc: interrupt-controller@0 {

		#address-cells = <0>;

		#interrupt-cells = <1>;

		interrupt-controller;

		compatible = "mti,cpu-interrupt-controller";

	};

};

arch/mips/jz4740/irq.c

+2 −2
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.h>

#include <linux/timex.h>

#include <linux/slab.h>

#include <linux/delay.h>
@@ -27,7 +28,6 @@ 


#include <asm/io.h>

#include <asm/mipsregs.h>

#include <asm/irq_cpu.h>



#include <asm/mach-jz4740/base.h>

#include <asm/mach-jz4740/irq.h>
@@ -84,7 +84,7 @@ void __init arch_init_irq(void) 
	struct irq_chip_generic *gc;

	struct irq_chip_type *ct;



	mips_cpu_irq_init();

	irqchip_init();



	jz_intc_base = ioremap(JZ4740_INTC_BASE_ADDR, 0x14);