Messages in this thread Patch in this message | | | From | Lubomir Rintel <> | Subject | [PATCH 08/19] irqchip/mmp: coexist with GIC root IRQ controller | Date | Fri, 9 Aug 2019 11:31:47 +0200 |
| |
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> --- drivers/irqchip/irq-mmp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c index 25497c75cc861..28feb0f393056 100644 --- a/drivers/irqchip/irq-mmp.c +++ b/drivers/irqchip/irq-mmp.c @@ -472,8 +472,13 @@ 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; - irq_set_default_host(icu_data[0].domain); - set_handle_irq(mmp2_handle_irq); + + if (!parent) { + /* This is the main interrupt controller. */ + irq_set_default_host(icu_data[0].domain); + set_handle_irq(mmp2_handle_irq); + } + max_icu_nr = 1; return 0; } -- 2.21.0
| |