irqchip: bcm7120-l2: Decouple driver from brcmstb-l2

Some chips, such as BCM6328, only require bcm7120-l2.  Some BCM7xxx STB
configurations only require brcmstb-l2.  Treat them as two separate
entities, and update the mach-bcm dependencies to reflect the change.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lkml.kernel.org/r/1415342669-30640-13-git-send-email-cernekee@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 2abad742516df753e487721b42e6d9cfdb50d91c..bf47eb09ff7ddae06c877503af79da89db031646 100644 (file)
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -125,6 +125,7 @@ config ARCH_BRCMSTB
        select HAVE_ARM_ARCH_TIMER
        select BRCMSTB_GISB_ARB
        select BRCMSTB_L2_IRQ
+       select BCM7120_L2_IRQ
        help
          Say Y if you intend to run the kernel on a Broadcom ARM-based STB
          chipset.

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 038b59e55b8a75777c479ce97cfd31d5e3e21581..9efe5f10f97b477047972f5006e656f9e019e31d 100644 (file)
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -48,6 +48,11 @@ config ATMEL_AIC5_IRQ
        select MULTI_IRQ_HANDLER
        select SPARSE_IRQ
 
+config BCM7120_L2_IRQ
+       bool
+       select GENERIC_IRQ_CHIP
+       select IRQ_DOMAIN
+
 config BRCMSTB_L2_IRQ
        bool
        select GENERIC_IRQ_CHIP

diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index 173bb5fa2cc945f6a5c60e7532754519b377ae17..f0909d05eae3f971e107150924b3decf61b47bf3 100644 (file)
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -35,6 +35,6 @@ obj-$(CONFIG_TB10X_IRQC)              += irq-tb10x.o
 obj-$(CONFIG_XTENSA)                   += irq-xtensa-pic.o
 obj-$(CONFIG_XTENSA_MX)                        += irq-xtensa-mx.o
 obj-$(CONFIG_IRQ_CROSSBAR)             += irq-crossbar.o
-obj-$(CONFIG_BRCMSTB_L2_IRQ)           += irq-brcmstb-l2.o \
-                                          irq-bcm7120-l2.o
+obj-$(CONFIG_BCM7120_L2_IRQ)           += irq-bcm7120-l2.o
+obj-$(CONFIG_BRCMSTB_L2_IRQ)           += irq-brcmstb-l2.o
 obj-$(CONFIG_KEYSTONE_IRQ)             += irq-keystone.o

diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c
index ef4d32cf267f730d67b5ff3b0f3730c73044c6b7..e53a3a629a06339f5c75eef3ed47bd7ff48c671e 100644 (file)
--- a/drivers/irqchip/irq-bcm7120-l2.c
+++ b/drivers/irqchip/irq-bcm7120-l2.c
@@ -247,5 +247,5 @@ out_unmap:
        kfree(data);
        return ret;
 }
-IRQCHIP_DECLARE(brcmstb_l2_intc, "brcm,bcm7120-l2-intc",
+IRQCHIP_DECLARE(bcm7120_l2_intc, "brcm,bcm7120-l2-intc",
                bcm7120_l2_intc_of_init);