Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner: "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" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/mips-gic: Fix Local compare interrupt irqchip/mvebu-odmi: Select GENERIC_MSI_IRQ_DOMAIN
This commit is contained in:
commit
907977b2a2
|
@ -262,6 +262,7 @@ config IRQ_MXS
|
|||
|
||||
config MVEBU_ODMI
|
||||
bool
|
||||
select GENERIC_MSI_IRQ_DOMAIN
|
||||
|
||||
config MVEBU_PIC
|
||||
bool
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue