Generic arm cpu hotplug related functions are moved to core hotplug code, Exynos-4 is having Cortex-A9, remove the functions from the platform code.
Signed-off-by: Sanjay Singh Rawat sanjay.rawat@linaro.org --- arch/arm/mach-exynos/hotplug.c | 40 ++-------------------------------------- 1 file changed, 2 insertions(+), 38 deletions(-)
diff --git a/arch/arm/mach-exynos/hotplug.c b/arch/arm/mach-exynos/hotplug.c index af90cfa..3489760 100644 --- a/arch/arm/mach-exynos/hotplug.c +++ b/arch/arm/mach-exynos/hotplug.c @@ -21,30 +21,10 @@
#include <mach/regs-pmu.h> #include <plat/cpu.h> +#include <asm/hotplug.h>
#include "common.h"
-static inline void cpu_enter_lowpower_a9(void) -{ - unsigned int v; - - asm volatile( - " mcr p15, 0, %1, c7, c5, 0\n" - " mcr p15, 0, %1, c7, c10, 4\n" - /* - * Turn off coherency - */ - " mrc p15, 0, %0, c1, c0, 1\n" - " bic %0, %0, %3\n" - " mcr p15, 0, %0, c1, c0, 1\n" - " mrc p15, 0, %0, c1, c0, 0\n" - " bic %0, %0, %2\n" - " mcr p15, 0, %0, c1, c0, 0\n" - : "=&r" (v) - : "r" (0), "Ir" (CR_C), "Ir" (0x40) - : "cc"); -} - static inline void cpu_enter_lowpower_a15(void) { unsigned int v; @@ -74,22 +54,6 @@ static inline void cpu_enter_lowpower_a15(void) dsb(); }
-static inline void cpu_leave_lowpower(void) -{ - unsigned int v; - - asm volatile( - "mrc p15, 0, %0, c1, c0, 0\n" - " orr %0, %0, %1\n" - " mcr p15, 0, %0, c1, c0, 0\n" - " mrc p15, 0, %0, c1, c0, 1\n" - " orr %0, %0, %2\n" - " mcr p15, 0, %0, c1, c0, 1\n" - : "=&r" (v) - : "Ir" (CR_C), "Ir" (0x40) - : "cc"); -} - static inline void platform_do_lowpower(unsigned int cpu, int *spurious) { for (;;) { @@ -144,7 +108,7 @@ void __ref exynos_cpu_die(unsigned int cpu) if ((primary_part & 0xfff0) == 0xc0f0) cpu_enter_lowpower_a15(); else - cpu_enter_lowpower_a9(); + cpu_enter_lowpower();
platform_do_lowpower(cpu, &spurious);