summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@linaro.org>2014-05-09 06:43:27 +0900
committerKukjin Kim <kgene.kim@samsung.com>2014-05-26 05:21:07 +0900
commit9bd5544af89618f2f5bee31a7ef24d987f2b3f1d (patch)
tree59cca217cd6e22eeb46a3f631d6626d7fdc0e634
parent20115fa874ce948f309b49d7b641d2cf55e09ad4 (diff)
downloadlinux-stable-9bd5544af89618f2f5bee31a7ef24d987f2b3f1d.tar.gz
linux-stable-9bd5544af89618f2f5bee31a7ef24d987f2b3f1d.tar.bz2
linux-stable-9bd5544af89618f2f5bee31a7ef24d987f2b3f1d.zip
ARM: EXYNOS: Fix S5P_WAKEUP_STAT call for cpuidle
This function should be called only when the powerdown sequence fails. Even if the current code does not hurt, by moving this line, we have the same code than the one in pm.c. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/mach-exynos/cpuidle.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c
index 144ff1e7bbf8..87f9f129883d 100644
--- a/arch/arm/mach-exynos/cpuidle.c
+++ b/arch/arm/mach-exynos/cpuidle.c
@@ -116,11 +116,10 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev,
if (!(tmp & S5P_CENTRAL_LOWPWR_CFG)) {
tmp |= S5P_CENTRAL_LOWPWR_CFG;
__raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
+ /* Clear wakeup state register */
+ __raw_writel(0x0, S5P_WAKEUP_STAT);
}
- /* Clear wakeup state register */
- __raw_writel(0x0, S5P_WAKEUP_STAT);
-
return index;
}