Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758084AbbEVPx2 (ORCPT ); Fri, 22 May 2015 11:53:28 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:4446 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757462AbbEVPxZ (ORCPT ); Fri, 22 May 2015 11:53:25 -0400 From: Paul Burton To: CC: , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , "Paul Burton" , Jason Cooper , "Thomas Gleixner" , Subject: [PATCH 05/15] irqchip: mips-gic: register IRQ domain with MIPS_GIC_IRQ_BASE Date: Fri, 22 May 2015 16:51:04 +0100 Message-ID: <1432309875-9712-6-git-send-email-paul.burton@imgtec.com> X-Mailer: git-send-email 2.4.1 In-Reply-To: <1432309875-9712-1-git-send-email-paul.burton@imgtec.com> References: <1432309875-9712-1-git-send-email-paul.burton@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.159.131] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1320 Lines: 36 On Malta, some IRQs are still referenced by hardcoded numbers relative to MIPS_GIC_IRQ_BASE. When gic_init is called to register the GIC without using device tree the irqbase argument allows this base to be used. When the GIC is probed using device tree however the base is not specified. This leads to conflicts between the GIC interrupts and other interrupt controllers. TODO: convert Malta (& SEAD3) to drop the hardcoded numbers instead Signed-off-by: Paul Burton --- drivers/irqchip/irq-mips-gic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c index 57f09cb..697f340 100644 --- a/drivers/irqchip/irq-mips-gic.c +++ b/drivers/irqchip/irq-mips-gic.c @@ -858,7 +858,7 @@ static int __init gic_of_init(struct device_node *node, write_gcr_gic_base(gic_base | CM_GCR_GIC_BASE_GICEN_MSK); gic_present = true; - __gic_init(gic_base, gic_len, cpu_vec, 0, node); + __gic_init(gic_base, gic_len, cpu_vec, MIPS_GIC_IRQ_BASE, node); return 0; } -- 2.4.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/