diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-20 03:01:26 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-20 03:01:26 +0900 |
| commit | ab5a4e6381d27a6554e6833383e536773e3a6ec1 (patch) | |
| tree | 88cfa18c33229cea756c2308607c26c1f19e9203 /arch/arm/mach-exynos/pm.c | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
| parent | 5ddfa8428b9f21453b1160846143e0b50d51b27c (diff) | |
| download | lwn-ab5a4e6381d27a6554e6833383e536773e3a6ec1.tar.gz lwn-ab5a4e6381d27a6554e6833383e536773e3a6ec1.zip | |
Merge branch 'next/devel-samsung' into next/devel-samsung-2
Diffstat (limited to 'arch/arm/mach-exynos/pm.c')
| -rw-r--r-- | arch/arm/mach-exynos/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 428cfeb57724..f0bb4677eb11 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -313,7 +313,7 @@ static int exynos4_pm_suspend(void) tmp &= ~S5P_CENTRAL_LOWPWR_CFG; __raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION); - if (soc_is_exynos4212()) { + if (soc_is_exynos4212() || soc_is_exynos4412()) { tmp = __raw_readl(S5P_CENTRAL_SEQ_OPTION); tmp &= ~(S5P_USE_STANDBYWFI_ISP_ARM | S5P_USE_STANDBYWFE_ISP_ARM); |