Merge branch 'next/soc' into next/dt

1 files changed, 14 insertions, 9 deletions

diff --git a/arch/arm/mach-tegra/hotplug.c b/arch/arm/mach-tegra/hotplug.c
index dca5141a2c31..a599f6e36dea 100644
--- a/arch/arm/mach-tegra/hotplug.c
+++ b/arch/arm/mach-tegra/hotplug.c
@@ -10,15 +10,26 @@
  */
 #include <linux/kernel.h>
 #include <linux/smp.h>
+#include <linux/clk/tegra.h>
 
 #include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 
 #include "sleep.h"
-#include "tegra_cpu_car.h"
 
 static void (*tegra_hotplug_shutdown)(void);
 
+int tegra_cpu_kill(unsigned cpu)
+{
+        cpu = cpu_logical_map(cpu);
+
+        /* Clock gate the CPU */
+        tegra_wait_cpu_in_reset(cpu);
+        tegra_disable_cpu_clock(cpu);
+
+        return 1;
+}
+
 /*
  * platform-specific code to shutdown a CPU
  *
@@ -26,18 +37,12 @@ static void (*tegra_hotplug_shutdown)(void);
  */
 void __ref tegra_cpu_die(unsigned int cpu)
 {
-        cpu = cpu_logical_map(cpu);
-
-        /* Flush the L1 data cache. */
-        flush_cache_all();
+        /* Clean L1 data cache */
+        tegra_disable_clean_inv_dcache();
 
         /* Shut down the current CPU. */
         tegra_hotplug_shutdown();
 
-        /* Clock gate the CPU */
-        tegra_wait_cpu_in_reset(cpu);
-        tegra_disable_cpu_clock(cpu);
-
         /* Should never return here. */
         BUG();
 }