Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161562AbbBDPgJ (ORCPT ); Wed, 4 Feb 2015 10:36:09 -0500 Received: from mailapp01.imgtec.com ([195.59.15.196]:56227 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965247AbbBDPWa (ORCPT ); Wed, 4 Feb 2015 10:22:30 -0500 From: Zubair Lutfullah Kakakhel To: CC: , , , , , , , , , , , , Subject: [PATCH_V2 04/34] MIPS: jz4740: probe CPU interrupt controller via DT Date: Wed, 4 Feb 2015 15:21:33 +0000 Message-ID: <1423063323-19419-5-git-send-email-Zubair.Kakakhel@imgtec.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1423063323-19419-1-git-send-email-Zubair.Kakakhel@imgtec.com> References: <1423063323-19419-1-git-send-email-Zubair.Kakakhel@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.154.89] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1840 Lines: 66 From: Paul Burton 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: Paul Burton Cc: Lars-Peter Clausen --- arch/mips/boot/dts/jz4740.dtsi | 7 +++++++ arch/mips/jz4740/irq.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/mips/boot/dts/jz4740.dtsi b/arch/mips/boot/dts/jz4740.dtsi index c538691f..2d64765c 100644 --- a/arch/mips/boot/dts/jz4740.dtsi +++ b/arch/mips/boot/dts/jz4740.dtsi @@ -2,4 +2,11 @@ #address-cells = <1>; #size-cells = <1>; compatible = "ingenic,jz4740"; + + cpuintc: cpuintc@0 { + #address-cells = <0>; + #interrupt-cells = <1>; + interrupt-controller; + compatible = "mti,cpu-interrupt-controller"; + }; }; diff --git a/arch/mips/jz4740/irq.c b/arch/mips/jz4740/irq.c index 2531da1..9c94f7b 100644 --- a/arch/mips/jz4740/irq.c +++ b/arch/mips/jz4740/irq.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -27,7 +28,6 @@ #include #include -#include #include @@ -81,7 +81,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); -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/