Commit a4fcbb86 authored by Kevin Cernekee's avatar Kevin Cernekee Committed by Jason Cooper
Browse files

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: default avatarKevin Cernekee <cernekee@gmail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Link: https://lkml.kernel.org/r/1415342669-30640-13-git-send-email-cernekee@gmail.com


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent c76acf4d

arch/arm/mach-bcm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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.

drivers/irqchip/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -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

drivers/irqchip/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/irqchip/irq-bcm7120-l2.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE