projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next-samsung-devel' into next-samsung-devel-2
[deliverable/linux.git]
/
arch
/
arm
/
mach-exynos4
/
pm.c
diff --git
a/arch/arm/mach-exynos4/pm.c
b/arch/arm/mach-exynos4/pm.c
index 62e4f43630068dc9aa852f1ab479f82880724d36..509a435afd4bf85cf4636343b0cdd32bbf94a863 100644
(file)
--- a/
arch/arm/mach-exynos4/pm.c
+++ b/
arch/arm/mach-exynos4/pm.c
@@
-339,6
+339,13
@@
static int exynos4_pm_suspend(void)
tmp &= ~S5P_CENTRAL_LOWPWR_CFG;
__raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
tmp &= ~S5P_CENTRAL_LOWPWR_CFG;
__raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
+ if (soc_is_exynos4212()) {
+ tmp = __raw_readl(S5P_CENTRAL_SEQ_OPTION);
+ tmp &= ~(S5P_USE_STANDBYWFI_ISP_ARM |
+ S5P_USE_STANDBYWFE_ISP_ARM);
+ __raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION);
+ }
+
/* Save Power control register */
asm ("mrc p15, 0, %0, c15, c0, 0"
: "=r" (tmp) : : "cc");
/* Save Power control register */
asm ("mrc p15, 0, %0, c15, c0, 0"
: "=r" (tmp) : : "cc");
This page took
0.03713 seconds
and
5
git commands to generate.