Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <lkundrak@v3.sk>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20190822092643.593488-10-lkundrak@v3.sk

authored by

Lubomir Rintel and committed by
Marc Zyngier
2178add0 9e8e8912

+6 -1
+6 -1
drivers/irqchip/irq-mmp.c
··· 468 468 icu_data[0].conf_disable = mmp3_conf.conf_disable; 469 469 icu_data[0].conf_mask = mmp3_conf.conf_mask; 470 470 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 + 472 477 max_icu_nr = 1; 473 478 return 0; 474 479 }