Skip to content

Commit 2178add

Browse files
lkundrakMarc Zyngier
authored andcommitted
irqchip/mmp: Coexist with GIC root IRQ controller
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 <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 9e8e891 commit 2178add

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/irqchip/irq-mmp.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,12 @@ static int __init mmp3_of_init(struct device_node *node,
468468
icu_data[0].conf_disable = mmp3_conf.conf_disable;
469469
icu_data[0].conf_mask = mmp3_conf.conf_mask;
470470
icu_data[0].conf2_mask = mmp3_conf.conf2_mask;
471-
set_handle_irq(mmp2_handle_irq);
471+
472+
if (!parent) {
473+
/* This is the main interrupt controller. */
474+
set_handle_irq(mmp2_handle_irq);
475+
}
476+
472477
max_icu_nr = 1;
473478
return 0;
474479
}

0 commit comments

Comments
 (0)