summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/gpc.c
diff options
context:
space:
mode:
authorRobin Gong <b38343@freescale.com>2015-05-22 10:59:23 +0800
committerRobin Gong <b38343@freescale.com>2015-05-22 19:13:11 +0800
commitc6b7d7aabbccaf8cdf25cf6bb317a725cdedf140 (patch)
tree27c815d269856b399054157ed82b2749f1d7ffd0 /arch/arm/mach-imx/gpc.c
parent13efae98a44713f8dbd142b24be818f1e5e2c7a9 (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>
Diffstat (limited to 'arch/arm/mach-imx/gpc.c')
-rw-r--r--arch/arm/mach-imx/gpc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c
index 2815e1636c72..18f026bef9eb 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);