Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7c42ec2 authored by Simon Arlott's avatar Simon Arlott Committed by Thomas Gleixner
Browse files

irqchips/bmips: Add bcm6345-l1 interrupt controller 



Add the BCM6345 interrupt controller based on the SMP-capable BCM7038
and the BCM3380 but with packed interrupt registers.

Add the BCM6345 interrupt controller to a list with the existing BCM7038
so that interrupts on CPU1 are not ignored.

Update the maintainers file list for BMIPS to include this driver.

Signed-off-by: default avatarSimon Arlott <simon@fire.lp0.eu>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: devicetree@vger.kernel.org
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: linux-mips@linux-mips.org
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Jonas Gorski <jogo@openwrt.org>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: Rob Herring <robh@kernel.org>
Link: http://lkml.kernel.org/r/5651D176.6030908@simon.arlott.org.uk


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4b5ce20b

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2423,6 +2423,7 @@ F: arch/mips/bmips/* 
F:	arch/mips/include/asm/mach-bmips/*

F:	arch/mips/kernel/*bmips*

F:	arch/mips/boot/dts/brcm/bcm*.dts*

F:	drivers/irqchip/irq-bcm63*

F:	drivers/irqchip/irq-bcm7*

F:	drivers/irqchip/irq-brcmstb*

F:	include/linux/bcm963xx_nvram.h

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ config BMIPS_GENERIC 
	select CSRC_R4K

	select SYNC_R4K

	select COMMON_CLK

	select BCM6345_L1_IRQ

	select BCM7038_L1_IRQ

	select BCM7120_L2_IRQ

	select BRCMSTB_L2_IRQ

arch/mips/bmips/irq.c

+8 −2
Original line number Diff line number Diff line
@@ -15,6 +15,12 @@ 
#include <asm/irq_cpu.h>

#include <asm/time.h>



static const struct of_device_id smp_intc_dt_match[] = {

	{ .compatible = "brcm,bcm7038-l1-intc" },

	{ .compatible = "brcm,bcm6345-l1-intc" },

	{}

};



unsigned int get_c0_compare_int(void)

{

	return CP0_LEGACY_COMPARE_IRQ;
@@ -24,8 +30,8 @@ void __init arch_init_irq(void) 
{

	struct device_node *dn;



	/* Only the STB (bcm7038) controller supports SMP IRQ affinity */

	dn = of_find_compatible_node(NULL, NULL, "brcm,bcm7038-l1-intc");

	/* Only these controllers support SMP IRQ affinity */

	dn = of_find_matching_node(NULL, smp_intc_dt_match);

	if (dn)

		of_node_put(dn);

	else

drivers/irqchip/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -78,6 +78,11 @@ config I8259 
	bool

	select IRQ_DOMAIN



config BCM6345_L1_IRQ

	bool

	select GENERIC_IRQ_CHIP

	select IRQ_DOMAIN



config BCM7038_L1_IRQ

	bool

	select GENERIC_IRQ_CHIP

drivers/irqchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ obj-$(CONFIG_XTENSA) += irq-xtensa-pic.o 
obj-$(CONFIG_XTENSA_MX)			+= irq-xtensa-mx.o

obj-$(CONFIG_IRQ_CROSSBAR)		+= irq-crossbar.o

obj-$(CONFIG_SOC_VF610)			+= irq-vf610-mscm-ir.o

obj-$(CONFIG_BCM6345_L1_IRQ)		+= irq-bcm6345-l1.o

obj-$(CONFIG_BCM7038_L1_IRQ)		+= irq-bcm7038-l1.o

obj-$(CONFIG_BCM7120_L2_IRQ)		+= irq-bcm7120-l2.o

obj-$(CONFIG_BRCMSTB_L2_IRQ)		+= irq-brcmstb-l2.o