From: Barry.Song@csr.com (Barry Song)
To: linux-arm-kernel@lists.infradead.org
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 [thread overview]
Message-ID: <1345700519-667-4-git-send-email-Barry.Song@csr.com> (raw)
In-Reply-To: <1345700519-667-1-git-send-email-Barry.Song@csr.com>
From: Barry Song <Baohua.Song@csr.com>
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 <Baohua.Song@csr.com>
---
-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)
--
1.7.0.4
Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
next prev parent reply other threads:[~2012-08-23 5:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-23 5:41 [PATCH v2 0/3] ARM: PRIMA2: some patches prepared to support new SiRF SoCs Barry Song
2012-08-23 5:41 ` [PATCH v2 1/3] ARM: PRIMA2: use DT_MACHINE_START and convert to generic board Barry Song
2012-08-23 5:41 ` [PATCH v2 2/3] ARM: PRIMA2: adjust Kconfig to support select SoC features Barry Song
2012-08-23 5:41 ` Barry Song [this message]
2012-08-23 8:48 ` [PATCH v2 0/3] ARM: PRIMA2: some patches prepared to support new SiRF SoCs Arnd Bergmann
2012-08-23 9:09 ` Barry Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345700519-667-4-git-send-email-Barry.Song@csr.com \
--to=barry.song@csr.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.