Skip to content

Commit

Permalink
Revert "soc: imx: gpcv2: move reset assert after requesting domain po…
Browse files Browse the repository at this point in the history
…wer up"

This reverts commit a77ebdd9f553. It turns out that the VPU domain has no
different requirements, even though the downstream ATF implementation seems
to suggest otherwise. Powering on the domain with the reset asserted works
fine. As the changed sequence has caused sporadic issues with the GPU
domains, just revert the change to go back to the working sequence.

Cc: <stable@vger.kernel.org> # 5.14
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Peng Fan <peng.fan@nxp.com>
Tested-by: Adam Ford <aford173@gmail.com> #imx8mm-beacon
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
  • Loading branch information
Lucas Stach authored and Shawn Guo committed Oct 5, 2021
1 parent 8da8bd5 commit 2b2f106
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/soc/imx/gpcv2.c
Original file line number Diff line number Diff line change
@@ -244,6 +244,8 @@ static int imx_pgc_power_up(struct generic_pm_domain *genpd)
goto out_regulator_disable;
}

reset_control_assert(domain->reset);

if (domain->bits.pxx) {
/* request the domain to power up */
regmap_update_bits(domain->regmap, GPC_PU_PGC_SW_PUP_REQ,
@@ -268,8 +270,6 @@ static int imx_pgc_power_up(struct generic_pm_domain *genpd)
}
}

reset_control_assert(domain->reset);

/* delay for reset to propagate */
udelay(5);

0 comments on commit 2b2f106

Please sign in to comment.