The following commit has been merged into the irq/core branch of tip:
Commit-ID: 2178add02238f8352f5b3294a79f4763183aade6
Gitweb: https://git.kernel.org/tip/2178add02238f8352f5b3294a79f4763183aade6
Author: Lubomir Rintel <lkundrak@xxxxx>
AuthorDate: Thu, 22 Aug 2019 11:26:32 +02:00
Committer: Marc Zyngier <maz@xxxxxxxxxx>
CommitterDate: Fri, 30 Aug 2019 15:23:30 +01:00
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@xxxxx>
Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20190822092643.593488-10-lkundrak@xxxxx
---
drivers/irqchip/irq-mmp.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c
index da290d8..4a74ac7 100644
--- a/drivers/irqchip/irq-mmp.c
+++ b/drivers/irqchip/irq-mmp.c
@@ -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;
}
|