summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/pm-imx6q.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-01-14 14:11:10 +0100
committerShawn Guo <shawn.guo@linaro.org>2013-01-14 15:19:48 +0100
commit83ae20981ae924c37d02a42c829155fc3851260c (patch)
tree2ae259f65a6daabc0904e82be7a89f5f17eb9209 /arch/arm/mach-imx/pm-imx6q.c
parentARM: imx: disable cpu in .cpu_kill hook (diff)
downloadlinux-83ae20981ae924c37d02a42c829155fc3851260c.tar.xz
linux-83ae20981ae924c37d02a42c829155fc3851260c.zip
ARM: imx: correct low-power mode setting
The hardware reset value of bit CCM_CLPCR_LPM enables WAIT mode (WAIT_UNCLOCKED) by default. However this is undesirable because WAIT mode should only be enabled when there is a driver managing ARM clock gating. Correct the initial power mode to WAIT_CLOCKED (disable WAIT mode). While at it, the power mode after resuming is also set back to WAIT_CLOCKED from STOP_POWER_OFF. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/pm-imx6q.c')
-rw-r--r--arch/arm/mach-imx/pm-imx6q.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6q.c
index a17543da602d..ee42d20cba19 100644
--- a/arch/arm/mach-imx/pm-imx6q.c
+++ b/arch/arm/mach-imx/pm-imx6q.c
@@ -41,6 +41,7 @@ static int imx6q_pm_enter(suspend_state_t state)
cpu_suspend(0, imx6q_suspend_finish);
imx_smp_prepare();
imx_gpc_post_resume();
+ imx6q_set_lpm(WAIT_CLOCKED);
break;
default:
return -EINVAL;