| Message ID | 1470752332-14185-2-git-send-email-p.zabel@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
On Tue, Aug 09, 2016 at 04:18:52PM +0200, Philipp Zabel wrote: > 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> > --- > arch/arm/mach-imx/gpc.c | 6 ++++++ > 1 file changed, 6 insertions(+) I've applied both patches. Rob
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c index fd87205..0df062d 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);
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> --- arch/arm/mach-imx/gpc.c | 6 ++++++ 1 file changed, 6 insertions(+)