1 files changed, 5 insertions, 1 deletions

diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 8e4ef4c83a74..9723d17b8f38 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -26,6 +26,7 @@
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/irqchip.h>
 #include <linux/random.h>
 #include <linux/smp.h>
 #include <linux/init.h>
@@ -114,7 +115,10 @@ EXPORT_SYMBOL_GPL(set_irq_flags);
 
 void __init init_IRQ(void)
 {
-        machine_desc->init_irq();
+        if (IS_ENABLED(CONFIG_OF) && !machine_desc->init_irq)
+                irqchip_init();
+        else
+                machine_desc->init_irq();
 }
 
 #ifdef CONFIG_MULTI_IRQ_HANDLER