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

Commit a89eae62 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'irq-fixes-4.11-rc5' of... 

Merge tag 'irq-fixes-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Pull irqchip fixes from Marc Zyngier

- Fix mvebu-odmi dependency selection
- Fix mips-gic virtual/hw mapping
parents 920c634a 42969893

drivers/irqchip/Kconfig

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

}