1 files changed, 19 insertions, 5 deletions

diff --git a/arch/arm/mach-omap2/omap-hotplug.c b/arch/arm/mach-omap2/omap-hotplug.c
index 56c345b8b931..414083b427df 100644
--- a/arch/arm/mach-omap2/omap-hotplug.c
+++ b/arch/arm/mach-omap2/omap-hotplug.c
@@ -17,8 +17,10 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/smp.h>
+#include <linux/io.h>
 
 #include <asm/cacheflush.h>
+#include <mach/omap-wakeupgen.h>
 
 #include "common.h"
 
@@ -35,7 +37,8 @@ int platform_cpu_kill(unsigned int cpu)
  */
 void __ref platform_cpu_die(unsigned int cpu)
 {
-        unsigned int this_cpu;
+        unsigned int boot_cpu = 0;
+        void __iomem *base = omap_get_wakeupgen_base();
 
         flush_cache_all();
         dsb();
@@ -43,16 +46,27 @@ void __ref platform_cpu_die(unsigned int cpu)
         /*
          * we're ready for shutdown now, so do it
          */
-        if (omap_modify_auxcoreboot0(0x0, 0x200) != 0x0)
-                pr_err("Secure clear status failed\n");
+        if (omap_secure_apis_support()) {
+                if (omap_modify_auxcoreboot0(0x0, 0x200) != 0x0)
+                        pr_err("Secure clear status failed\n");
+        } else {
+                __raw_writel(0, base + OMAP_AUX_CORE_BOOT_0);
+        }
+
 
         for (;;) {
                 /*
                  * Enter into low power state
                  */
                 omap4_hotplug_cpu(cpu, PWRDM_POWER_OFF);
-                this_cpu = smp_processor_id();
-                if (omap_read_auxcoreboot0() == this_cpu) {
+
+                if (omap_secure_apis_support())
+                        boot_cpu = omap_read_auxcoreboot0();
+                else
+                        boot_cpu =
+                                __raw_readl(base + OMAP_AUX_CORE_BOOT_0) >> 5;
+
+                if (boot_cpu == smp_processor_id()) {
                         /*
                          * OK, proper wakeup, we're done
                          */