From patchwork Thu Aug 23 05:41:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Barry Song X-Patchwork-Id: 1364471 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id E932CDF2AB for ; Thu, 23 Aug 2012 05:47:14 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T4QDN-0006ta-I6; Thu, 23 Aug 2012 05:44:21 +0000 Received: from cluster-d.mailcontrol.com ([85.115.60.190]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T4QDJ-0006rw-Tl for linux-arm-kernel@lists.infradead.org; Thu, 23 Aug 2012 05:44:18 +0000 Received: from rly23d.srv.mailcontrol.com (localhost.localdomain [127.0.0.1]) by rly23d.srv.mailcontrol.com (MailControl) with ESMTP id q7N5iD3u021581 for ; Thu, 23 Aug 2012 06:44:15 +0100 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by rly23d.srv.mailcontrol.com (MailControl) id q7N5hD2w015107 for ; Thu, 23 Aug 2012 06:43:13 +0100 Received: from banasiexc01.ASIA.ROOT.PRI ([202.80.51.114]) by rly23d-eth0.srv.mailcontrol.com (envelope-sender ) (MIMEDefang) with ESMTP id q7N5h9nf014416 (TLS bits=128 verify=FAIL); Thu, 23 Aug 2012 06:43:13 +0100 (BST) Received: from SHAASIEXC02.ASIA.ROOT.PRI (10.125.12.85) by banasiexc01.ASIA.ROOT.PRI (10.190.12.21) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 23 Aug 2012 11:13:09 +0530 Received: from localhost.localdomain (10.125.36.195) by asimail.csr.com (10.125.12.88) with Microsoft SMTP Server (TLS) id 14.1.355.2; Thu, 23 Aug 2012 13:43:07 +0800 From: Barry Song To: , Subject: [PATCH v2 3/3] ARM: SIRF: make sirf irqchip driver optional since new SoCs will have GIC Date: Thu, 23 Aug 2012 13:41:59 +0800 Message-ID: <1345700519-667-4-git-send-email-Barry.Song@csr.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1345700519-667-1-git-send-email-Barry.Song@csr.com> References: <1345700519-667-1-git-send-email-Barry.Song@csr.com> MIME-Version: 1.0 X-Originating-IP: [10.125.36.195] X-Scanned-By: MailControl 8316.0 (www.mailcontrol.com) on 10.68.1.133 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [85.115.60.190 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: linux-arm-kernel@lists.infradead.org, workgroup.linux@csr.com, Barry Song 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: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Barry Song New MARCO and POLO SoC use GIC, so make irq.c optional and enable it only if we enable ARCH_PRIMA2 in Kconfig Signed-off-by: Barry Song --- -v2: if dt node is not found, return but not panic since we might enable ARCH_PRIMA2 even we work on ARCH_MARCO arch/arm/mach-prima2/Kconfig | 4 ++++ arch/arm/mach-prima2/Makefile | 2 +- arch/arm/mach-prima2/irq.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig index 65438e1..41fc853 100644 --- a/arch/arm/mach-prima2/Kconfig +++ b/arch/arm/mach-prima2/Kconfig @@ -7,9 +7,13 @@ config ARCH_PRIMA2 default y select CPU_V7 select ZONE_DMA + select SIRF_IRQ help Support for CSR SiRFSoC ARM Cortex A9 Platform endmenu +config SIRF_IRQ + bool + endif diff --git a/arch/arm/mach-prima2/Makefile b/arch/arm/mach-prima2/Makefile index f2cde60..fc9ce22 100644 --- a/arch/arm/mach-prima2/Makefile +++ b/arch/arm/mach-prima2/Makefile @@ -1,8 +1,8 @@ obj-y := timer.o -obj-y += irq.o obj-y += rstc.o obj-y += common.o obj-y += rtciobrg.o obj-$(CONFIG_DEBUG_LL) += lluart.o obj-$(CONFIG_CACHE_L2X0) += l2x0.o obj-$(CONFIG_SUSPEND) += pm.o sleep.o +obj-$(CONFIG_SIRF_IRQ) += irq.o diff --git a/arch/arm/mach-prima2/irq.c b/arch/arm/mach-prima2/irq.c index a7b9415..7dee917 100644 --- a/arch/arm/mach-prima2/irq.c +++ b/arch/arm/mach-prima2/irq.c @@ -63,7 +63,7 @@ void __init sirfsoc_of_irq_init(void) np = of_find_matching_node(NULL, intc_ids); if (!np) - panic("unable to find compatible intc node in dtb\n"); + return; sirfsoc_intc_base = of_iomap(np, 0); if (!sirfsoc_intc_base)