diff options
| author | Robin Gong <b38343@freescale.com> | 2015-05-22 10:59:23 +0800 |
|---|---|---|
| committer | Robin Gong <b38343@freescale.com> | 2015-05-25 10:30:42 +0800 |
| commit | d5a48070ae10f49b720815644596c724ac5b9a84 (patch) | |
| tree | 91aed332f4ca2c3ea3afcc024d91245166ca95a6 | |
| parent | 855623ca0e87d8ad13f567f575e7e85af148836b (diff) | |
MLK-10957 : ARM: imx: gpc: do not turn off PU in GPC probe
There is narrow window that PRE driver is ready but GPU driver probe later,
and the later GPU driver turn on PU may cause 'PRE hang' issue. To simplify
thing, do not turn off PU in u-boot and PU power domain register.
check more information from below commit:
MLK-10465: ARM: imx6qp: keep PU always on for TKT259465
Signed-off-by: Robin Gong <b38343@freescale.com>
(cherry picked from commit c6b7d7aabbccaf8cdf25cf6bb317a725cdedf140)
| -rw-r--r-- | arch/arm/mach-imx/gpc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c index 983bf3319866..4134bf4186e0 100644 --- a/arch/arm/mach-imx/gpc.c +++ b/arch/arm/mach-imx/gpc.c @@ -598,7 +598,8 @@ static int imx_gpc_genpd_init(struct device *dev, struct regulator *pu_reg) imx6s_display_domain.num_clks = k; is_off = IS_ENABLED(CONFIG_PM_RUNTIME); - if (is_off) + if (is_off && !(cpu_is_imx6q() && + imx_get_soc_revision() == IMX_CHIP_REVISION_2_0)) imx6q_pm_pu_power_off(&imx6q_pu_domain.base); pm_genpd_init(&imx6q_pu_domain.base, NULL, is_off); |