Skip to contentSkip to conversation

irq fixes for 4.11

GIT PULL Thomas Gleixner 1 participant 1 message Apr 2, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

please pull the latest irq-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-for-linus

Two small fixlets:

- Select a required Kconfig to make the MVEBU driver compile

- Add the missing MIPS local GIC interrupts which prevent drivers to probe successfully.

Thanks,

tglx

------------------>
Arnd Bergmann (1):
irqchip/mvebu-odmi: Select GENERIC_MSI_IRQ_DOMAIN

Matt Redfearn (1):
irqchip/mips-gic: Fix Local compare interrupt

 drivers/irqchip/Kconfig        | 1 +
 drivers/irqchip/irq-mips-gic.c | 4 ++++
 2 files changed, 5 insertions(+)
drivers/irqchip/Kconfig +1 -0
index 125528f39e92..8162121bb1bc 100644
@@ -262,6 +262,7 @@ config IRQ_MXS
 
 config MVEBU_ODMI
 	bool
+	select GENERIC_MSI_IRQ_DOMAIN
 
 config MVEBU_PIC
 	bool
drivers/irqchip/irq-mips-gic.c +4 -0
index 11d12bccc4e7..cd20df12d63d 100644
@@ -991,8 +991,12 @@ static void __init gic_map_single_int(struct device_node *node,
 
 static void __init gic_map_interrupts(struct device_node *node)
 {
+	gic_map_single_int(node, GIC_LOCAL_INT_WD);
+	gic_map_single_int(node, GIC_LOCAL_INT_COMPARE);
 	gic_map_single_int(node, GIC_LOCAL_INT_TIMER);
 	gic_map_single_int(node, GIC_LOCAL_INT_PERFCTR);
+	gic_map_single_int(node, GIC_LOCAL_INT_SWINT0);
+	gic_map_single_int(node, GIC_LOCAL_INT_SWINT1);
 	gic_map_single_int(node, GIC_LOCAL_INT_FDC);
 }