projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'omap/multiplatform-fixes', tag 'v3.8-rc5' into next/multiplatform
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-imx
/
pm-imx6q.c
diff --git
a/arch/arm/mach-imx/pm-imx6q.c
b/arch/arm/mach-imx/pm-imx6q.c
index a17543da602da4d8c5504961434bba5bfa2551b2..ee42d20cba19f022d4a9ece8616e27b443d7e82e 100644
(file)
--- 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;