ARM: SIRF: make sirf irqchip driver optional since new SoCs will have GIC

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>

diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 65438e139037b19ec1bf9932fc730bda84b693be..41fc85327673c7ddd88abfc1d4686331cc109a10 100644 (file)
--- 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 f2cde60812a69a5900cf230879a4074d6b16fd29..fc9ce22e2b5a58f44c6de493f123f01f3808867a 100644 (file)
--- 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 a7b9415d30f822d39660164fb4db3f387bc31a0b..7dee9176e77a57ee6bac685cc06a274cca4e6f4f 100644 (file)
--- 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)