ARM: EXYNOS: Move scu_enable in the cpu_pm notifier

We make the cpuidle code less arch dependent.

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>

diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c
index 7a2d01bbef6b37800b783e274865cc136b860f08..bf1bf87af00ec3fe5dcc53295d3da3e5f094f202 100644 (file)
--- a/arch/arm/mach-exynos/cpuidle.c
+++ b/arch/arm/mach-exynos/cpuidle.c
@@ -19,7 +19,6 @@
 #include <linux/platform_device.h>
 
 #include <asm/proc-fns.h>
-#include <asm/smp_scu.h>
 #include <asm/suspend.h>
 #include <asm/unified.h>
 #include <asm/cpuidle.h>
@@ -75,11 +74,6 @@ static int exynos_enter_core0_aftr(struct cpuidle_device *dev,
 
        cpu_pm_enter();
        cpu_suspend(0, idle_finisher);
-
-#ifdef CONFIG_SMP
-       if (!soc_is_exynos5250())
-               scu_enable(S5P_VA_SCU);
-#endif
        cpu_pm_exit();
 
        /*

diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
index 3eb80cd4607d1fc3ff206e611b8b75e7cfd2a013..fb1d9160991ac228c6e4b7dfae3cff60b13ed606 100644 (file)
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@ -400,8 +400,13 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self,
                break;
 
        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();
+               }
                break;
        }