4 files changed, 53 insertions, 4 deletions

diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 3f257e76bfde..ddd4b72c6f9a 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -680,6 +680,8 @@ void __init exynos5_init_irq(void)
          * uses GIC instead of VIC.
          */
         s5p_init_irq(NULL, 0);
+
+        gic_arch_extn.irq_set_wake = s3c_irq_wake;
 }
 
 struct bus_type exynos_subsys = {
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c
index cff0595d0d35..8e4ec21ef2cf 100644
--- a/arch/arm/mach-exynos/cpuidle.c
+++ b/arch/arm/mach-exynos/cpuidle.c
@@ -116,7 +116,8 @@ static int exynos4_enter_core0_aftr(struct cpuidle_device *dev,
         cpu_suspend(0, idle_finisher);
 
 #ifdef CONFIG_SMP
-        scu_enable(S5P_VA_SCU);
+        if (!soc_is_exynos5250())
+                scu_enable(S5P_VA_SCU);
 #endif
         cpu_pm_exit();
 
diff --git a/arch/arm/mach-exynos/hotplug.c b/arch/arm/mach-exynos/hotplug.c
index f4d7dd20cdac..c3f825b27947 100644
--- a/arch/arm/mach-exynos/hotplug.c
+++ b/arch/arm/mach-exynos/hotplug.c
@@ -20,10 +20,11 @@
 #include <asm/smp_plat.h>
 
 #include <mach/regs-pmu.h>
+#include <plat/cpu.h>
 
 #include "common.h"
 
-static inline void cpu_enter_lowpower(void)
+static inline void cpu_enter_lowpower_a9(void)
 {
         unsigned int v;
 
@@ -45,6 +46,35 @@ static inline void cpu_enter_lowpower(void)
           : "cc");
 }
 
+static inline void cpu_enter_lowpower_a15(void)
+{
+        unsigned int v;
+
+        asm volatile(
+        "       mrc     p15, 0, %0, c1, c0, 0\n"
+        "       bic     %0, %0, %1\n"
+        "       mcr     p15, 0, %0, c1, c0, 0\n"
+          : "=&r" (v)
+          : "Ir" (CR_C)
+          : "cc");
+
+        flush_cache_louis();
+
+        asm volatile(
+        /*
+        * Turn off coherency
+        */
+        "       mrc     p15, 0, %0, c1, c0, 1\n"
+        "       bic     %0, %0, %1\n"
+        "       mcr     p15, 0, %0, c1, c0, 1\n"
+        : "=&r" (v)
+        : "Ir" (0x40)
+        : "cc");
+
+        isb();
+        dsb();
+}
+
 static inline void cpu_leave_lowpower(void)
 {
         unsigned int v;
@@ -103,11 +133,20 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
 void __ref exynos_cpu_die(unsigned int cpu)
 {
         int spurious = 0;
+        int primary_part = 0;
 
         /*
-         * we're ready for shutdown now, so do it
+         * we're ready for shutdown now, so do it.
+         * Exynos4 is A9 based while Exynos5 is A15; check the CPU part
+         * number by reading the Main ID register and then perform the
+         * appropriate sequence for entering low power.
          */
-        cpu_enter_lowpower();
+        asm("mrc p15, 0, %0, c0, c0, 0" : "=r"(primary_part) : : "cc");
+        if ((primary_part & 0xfff0) == 0xc0f0)
+                cpu_enter_lowpower_a15();
+        else
+                cpu_enter_lowpower_a9();
+
         platform_do_lowpower(cpu, &spurious);
 
         /*
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
index c06c992943a1..8df6ec547f78 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;
 }