aboutsummaryrefslogtreecommitdiff
path: root/drivers/irqchip/irq-mips-cpu.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-25 11:12:29 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-25 11:12:29 +0100
commit072a51be8ecfb84e15b27b7f80a601560f386788 (patch)
treecd7bee45536733a987e70037b109eb1bd9a4cc36 /drivers/irqchip/irq-mips-cpu.c
parent3ac6e56c325e4660837efcf995e8460d917b4778 (diff)
parent6ee1d745b7c9fd573fba142a2efdad76a9f1cb04 (diff)
Merge 5.11-rc5 into driver-core-next
We need the fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/irqchip/irq-mips-cpu.c')
-rw-r--r--drivers/irqchip/irq-mips-cpu.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-mips-cpu.c b/drivers/irqchip/irq-mips-cpu.c
index 95d4fd8f7a96..0bbb0b2d0dd5 100644
--- a/drivers/irqchip/irq-mips-cpu.c
+++ b/drivers/irqchip/irq-mips-cpu.c
@@ -197,6 +197,13 @@ static int mips_cpu_ipi_alloc(struct irq_domain *domain, unsigned int virq,
if (ret)
return ret;
+ ret = irq_domain_set_hwirq_and_chip(domain->parent, virq + i, hwirq,
+ &mips_mt_cpu_irq_controller,
+ NULL);
+
+ if (ret)
+ return ret;
+
ret = irq_set_irq_type(virq + i, IRQ_TYPE_LEVEL_HIGH);
if (ret)
return ret;