diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-30 09:12:33 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-30 09:12:33 -0800 |
| commit | 5c1af2a7011bf719807de360cb64c2f610269a38 (patch) | |
| tree | fc4e6657d30c6eb48367c40e50c6b7428f96aaea /arch/arm/mach-exynos/pm.c | |
| parent | ef7848683f4de4903376638b69e6b4ac729b3ead (diff) | |
| parent | 573e5bbe653d01dc0f27e2d97754db9246b501c8 (diff) | |
Merge branch 'next/pm-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/pm
From Kukjin Kim:
* 'next/pm-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Add flush_cache_all in suspend finisher
ARM: EXYNOS: Remove scu_enable from cpuidle
ARM: EXYNOS: Fix soft reboot hang after suspend/resume
ARM: EXYNOS: Add support for rtc wakeup
ARM: EXYNOS: fix the hotplug for Cortex-A15
+ Linux 3.7-rc6
Diffstat (limited to 'arch/arm/mach-exynos/pm.c')
| -rw-r--r-- | arch/arm/mach-exynos/pm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index c06c992943a..8df6ec547f7 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -81,6 +81,9 @@ static int exynos_cpu_suspend(unsigned long arg) outer_flush_all(); #endif + if (soc_is_exynos5250()) + flush_cache_all(); + /* issue the standby signal into the pm unit. */ cpu_do_idle(); @@ -312,6 +315,10 @@ static void exynos_pm_resume(void) } early_wakeup: + + /* Clear SLEEP mode set in INFORM1 */ + __raw_writel(0x0, S5P_INFORM1); + return; } |