From patchwork Thu Nov 1 12:23:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alban Bedel X-Patchwork-Id: 1684911 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 0A49C3FE20 for ; Thu, 1 Nov 2012 12:27:35 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TTtq0-0003y5-AY; Thu, 01 Nov 2012 12:25:32 +0000 Received: from moutng.kundenserver.de ([212.227.126.186]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TTtpw-0003xk-D9 for linux-arm-kernel@lists.infradead.org; Thu, 01 Nov 2012 12:25:29 +0000 Received: from mailbox.adnet.avionic-design.de (mailbox.avionic-design.de [109.75.18.3]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0MP6Q7-1TQLSr3R39-006JA9; Thu, 01 Nov 2012 13:25:11 +0100 Received: from localhost (localhost [127.0.0.1]) by mailbox.adnet.avionic-design.de (Postfix) with ESMTP id 3AEED2A28395; Thu, 1 Nov 2012 13:25:10 +0100 (CET) X-Virus-Scanned: amavisd-new at avionic-design.de Received: from mailbox.adnet.avionic-design.de ([127.0.0.1]) by localhost (mailbox.avionic-design.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X9s2jOfe1hFI; Thu, 1 Nov 2012 13:25:08 +0100 (CET) Received: from localhost.localdomain (avionic-0020.adnet.avionic-design.de [172.20.31.243]) (Authenticated sender: alban.bedel) by mailbox.adnet.avionic-design.de (Postfix) with ESMTPA id 878AD2A281DE; Thu, 1 Nov 2012 13:25:08 +0100 (CET) From: Alban Bedel To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] lpc32xx: irq - Set the chain handlers after setting up the IRQ domain Date: Thu, 1 Nov 2012 13:23:46 +0100 Message-Id: <1351772626-12615-1-git-send-email-alban.bedel@avionic-design.de> X-Mailer: git-send-email 1.7.0.4 X-Provags-ID: V02:K0:J72+vgWNVJD/eRrhPN4e86WHI/W1rd8kPBJ5AkpPJI6 KFk3CD91AwdtJIOiw1NPQveSaLW59wL2OpECZg26gxvIMVxTEF HwwyDKVioiGMHqI4iGVeIXQYDNo9hV8/VxExzH6zU7k/LoG96h DhnFd2l/LB3Texu0i5R/O2a43nOg3ICXitifWokKYRb3FpQJDp j1V6D4TXc8lZk/mjIHD7CnTwa2T8EKx/YM9XpkTQEnIr/WLg3m PPJkxHf+kQUHnz6LVrBiz6ILNGjKsWNWGOnQRtB4r8tidE3K1+ JkjxfWu5derGkspwUC7NoVG5AzKQYUwjfB8LRG4btuExVGsYpy SJNvwGilNxLw3m3c2w94keCVlq1wPCM+vUDdglDMz1aWiF7KVF u5Rzuyh5A3rEWhpzRCXFzWNis/aDsQdr9CWZ3g8Nr71WeOst+g Nf4K1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121101_082528_839438_318CB725 X-CRM114-Status: UNSURE ( 9.40 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.186 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Roland Stigge , Alban Bedel , Russell King X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Signed-off-by: Alban Bedel --- arch/arm/mach-lpc32xx/irq.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-lpc32xx/irq.c b/arch/arm/mach-lpc32xx/irq.c index 3c63327..b92dc25 100644 --- a/arch/arm/mach-lpc32xx/irq.c +++ b/arch/arm/mach-lpc32xx/irq.c @@ -448,10 +448,6 @@ void __init lpc32xx_init_irq(void) __raw_writel(0, LPC32XX_INTC_MASK(LPC32XX_SIC1_BASE)); __raw_writel(0, LPC32XX_INTC_MASK(LPC32XX_SIC2_BASE)); - /* MIC SUBIRQx interrupts will route handling to the chain handlers */ - irq_set_chained_handler(IRQ_LPC32XX_SUB1IRQ, lpc32xx_sic1_handler); - irq_set_chained_handler(IRQ_LPC32XX_SUB2IRQ, lpc32xx_sic2_handler); - /* Initially disable all wake events */ __raw_writel(0, LPC32XX_CLKPWR_P01_ER); __raw_writel(0, LPC32XX_CLKPWR_INT_ER); @@ -485,6 +481,12 @@ void __init lpc32xx_init_irq(void) irq_base, 0, &irq_domain_simple_ops, NULL); - if (!lpc32xx_mic_domain) + if (!lpc32xx_mic_domain) { panic("Unable to add MIC irq domain\n"); + return; + } + + /* MIC SUBIRQx interrupts will route handling to the chain handlers */ + irq_set_chained_handler(IRQ_LPC32XX_SUB1IRQ, lpc32xx_sic1_handler); + irq_set_chained_handler(IRQ_LPC32XX_SUB2IRQ, lpc32xx_sic2_handler); }