Skip to content

Commit

Permalink
irqchip/mmp: Coexist with GIC root IRQ controller
Browse files Browse the repository at this point in the history
On MMP3, the GIC can be set as a root IRQ interrupt controller. If the
device tree indicated that GIC is enabled, avoid hooking up
mmp2_handle_irq().

The interrupt muxes are still being used.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20190822092643.593488-10-lkundrak@v3.sk
  • Loading branch information
Lubomir Rintel authored and Marc Zyngier committed Aug 30, 2019
1 parent 9e8e891 commit 2178add
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/irqchip/irq-mmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,12 @@ static int __init mmp3_of_init(struct device_node *node,
icu_data[0].conf_disable = mmp3_conf.conf_disable;
icu_data[0].conf_mask = mmp3_conf.conf_mask;
icu_data[0].conf2_mask = mmp3_conf.conf2_mask;
set_handle_irq(mmp2_handle_irq);

if (!parent) {
/* This is the main interrupt controller. */
set_handle_irq(mmp2_handle_irq);
}

max_icu_nr = 1;
return 0;
}
Expand Down

0 comments on commit 2178add

Please sign in to comment.