diff options
| author | Leonard Crestez <leonard.crestez@nxp.com> | 2018-05-23 16:06:31 +0300 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:31:51 +0800 |
| commit | 70eedd753a03b7322c96aea9d658e805853b5b2c (patch) | |
| tree | 061ff9708dbb65d923b743f63184c2891bc302ef /arch/arm/mach-imx | |
| parent | dab5d15ffe07f00a77d275d5a5883f4a1e069176 (diff) | |
MLK-18181-1 ARM: imx: Clear OF_POPULATED in imx_gpcv2_init
The power domain code shares the same node and will not probe if irqchip
probes first and marks the node with OF_POPULATED.
Clearing the OF_POPULATED flag is also done in imx_gpc_init for imx6 and
imx_gpcv2_irqchip_init implemented by upstream.
In imx_4.9.y this was solved in a different way by adding a second pgc
node, see commit fab513930e78 ("MLK-14280: gpc: gpc driver not probed").
Solving the problem by clearing OF_POPULATED allows using the upstream
PGC driver without hacks.
Having two irqchip implementations with same name seems to work fine
with the mach-imx variant taking precedence.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/gpcv2.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/gpcv2.c b/arch/arm/mach-imx/gpcv2.c index ef16e55ef831..4174cb228b46 100644 --- a/arch/arm/mach-imx/gpcv2.c +++ b/arch/arm/mach-imx/gpcv2.c @@ -950,6 +950,12 @@ static int __init imx_gpcv2_init(struct device_node *node, /* disable RBC */ imx_gpcv2_enable_rbc(false); + /* + * 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; } |