Commit 795537da authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Kukjin Kim

ARM: EXYNOS: Move scu_enable in the cpu_pm notifier

We make the cpuidle code less arch dependent.
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Reviewed-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 85f9f908
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <asm/proc-fns.h> #include <asm/proc-fns.h>
#include <asm/smp_scu.h>
#include <asm/suspend.h> #include <asm/suspend.h>
#include <asm/unified.h> #include <asm/unified.h>
#include <asm/cpuidle.h> #include <asm/cpuidle.h>
...@@ -75,11 +74,6 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev, ...@@ -75,11 +74,6 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev,
cpu_pm_enter(); cpu_pm_enter();
cpu_suspend(0, idle_finisher); cpu_suspend(0, idle_finisher);
#ifdef CONFIG_SMP
if (!soc_is_exynos5250())
scu_enable(S5P_VA_SCU);
#endif
cpu_pm_exit(); cpu_pm_exit();
/* /*
......
...@@ -400,8 +400,13 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self, ...@@ -400,8 +400,13 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self,
break; break;
case CPU_PM_EXIT: case CPU_PM_EXIT:
if (cpu == 0) if (cpu == 0) {
#ifdef CONFIG_SMP
if (!soc_is_exynos5250())
scu_enable(S5P_VA_SCU);
#endif
exynos_cpu_restore_register(); exynos_cpu_restore_register();
}
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment