summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2016-08-09 16:18:52 +0200
committerRob Herring <robh@kernel.org>2016-08-09 12:36:28 -0500
commit255c0397bc402e3fcc8833c214f49b2108f04d1a (patch)
tree0e8754bfd3826b62e9894d9a01ab079a62269e9a /arch
parente55aeb6ba4e8cc3549bff1e75ea1d029324bce21 (diff)
downloadlinux-stable-255c0397bc402e3fcc8833c214f49b2108f04d1a.tar.gz
linux-stable-255c0397bc402e3fcc8833c214f49b2108f04d1a.tar.bz2
linux-stable-255c0397bc402e3fcc8833c214f49b2108f04d1a.zip
ARM: imx6: mark GPC node as not populated after irq init to probe pm domain driver
Since IRQCHIP_DECLARE now flags the GPC node as already populated, the GPC power domain driver is never probed unless we clear the flag again. Fixes: 15cc2ed6dcf9 ("of/irq: Mark initialised interrupt controllers as populated") Suggested-by: Rob Herring <robh@kernel.org> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Cc: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/gpc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c
index fd8720532471..0df062d8b2c9 100644
--- a/arch/arm/mach-imx/gpc.c
+++ b/arch/arm/mach-imx/gpc.c
@@ -271,6 +271,12 @@ static int __init imx_gpc_init(struct device_node *node,
for (i = 0; i < IMR_NUM; i++)
writel_relaxed(~0, gpc_base + GPC_IMR1 + i * 4);
+ /*
+ * Clear the OF_POPULATED flag set in of_irq_init so that
+ * later the GPC power domain driver will not be skipped.
+ */
+ of_node_clear_flag(node, OF_POPULATED);
+
return 0;
}
IRQCHIP_DECLARE(imx_gpc, "fsl,imx6q-gpc", imx_gpc_init);