1 files changed, 5 insertions, 0 deletions

diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c
index e1537f9e45b8..722e5df7e44e 100644
--- a/arch/arm/mach-imx/gpc.c
+++ b/arch/arm/mach-imx/gpc.c
@@ -101,11 +101,16 @@ static void imx_gpc_irq_mask(struct irq_data *d)
 void __init imx_gpc_init(void)
 {
         struct device_node *np;
+        int i;
 
         np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpc");
         gpc_base = of_iomap(np, 0);
         WARN_ON(!gpc_base);
 
+        /* Initially mask all interrupts */
+        for (i = 0; i < IMR_NUM; i++)
+                writel_relaxed(~0, gpc_base + GPC_IMR1 + i * 4);
+
         /* Register GPC as the secondary interrupt controller behind GIC */
         gic_arch_extn.irq_mask = imx_gpc_irq_mask;
         gic_arch_extn.irq_unmask = imx_gpc_irq_unmask;