[GIT pull] irq fixes for 4.11

From	Thomas Gleixner <tglx@linutronix.de>
Newsgroups	linux.kernel
Subject	[GIT pull] irq fixes for 4.11
Date	2017-04-02 09:40 +0200
Message-ID	<trIhc-5UP-9@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View 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(+)

diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 125528f39e92..8162121bb1bc 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -262,6 +262,7 @@ config IRQ_MXS
 
 config MVEBU_ODMI
 	bool
+	select GENERIC_MSI_IRQ_DOMAIN
 
 config MVEBU_PIC
 	bool
diff --git a/drivers/irqchip/irq-mips-gic.c b/drivers/irqchip/irq-mips-gic.c
index 11d12bccc4e7..cd20df12d63d 100644
--- a/drivers/irqchip/irq-mips-gic.c
+++ b/drivers/irqchip/irq-mips-gic.c
@@ -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);
 }

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[GIT pull] irq fixes for 4.11 Thomas Gleixner <tglx@linutronix.de> - 2017-04-02 09:40 +0200

csiph-web