Commit 664ba443 authored by Leela Krishna Amudala's avatar Leela Krishna Amudala Committed by Kukjin Kim

ARM: EXYNOS: use generic exynos cpu power control functions

Use generic exynos cpu power control functions to power up/down
and to know the status of the cpu in platsmp and hotplug code.
Signed-off-by: default avatarLeela Krishna Amudala <leela.krishna@linaro.org>
Signed-off-by: default avatarAbhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent d3af6976
...@@ -96,7 +96,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious) ...@@ -96,7 +96,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
/* make cpu1 to be turned off at next WFI command */ /* make cpu1 to be turned off at next WFI command */
if (cpu == 1) if (cpu == 1)
__raw_writel(0, S5P_ARM_CORE1_CONFIGURATION); exynos_cpu_power_down(cpu);
/* /*
* here's the WFI * here's the WFI
......
...@@ -133,15 +133,12 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) ...@@ -133,15 +133,12 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
*/ */
write_pen_release(phys_cpu); write_pen_release(phys_cpu);
if (!(__raw_readl(S5P_ARM_CORE1_STATUS) & S5P_CORE_LOCAL_PWR_EN)) { if (!exynos_cpu_power_state(cpu)) {
__raw_writel(S5P_CORE_LOCAL_PWR_EN, exynos_cpu_power_up(cpu);
S5P_ARM_CORE1_CONFIGURATION);
timeout = 10; timeout = 10;
/* wait max 10 ms until cpu1 is on */ /* wait max 10 ms until cpu1 is on */
while ((__raw_readl(S5P_ARM_CORE1_STATUS) while (exynos_cpu_power_state(cpu) != S5P_CORE_LOCAL_PWR_EN) {
& S5P_CORE_LOCAL_PWR_EN) != S5P_CORE_LOCAL_PWR_EN) {
if (timeout-- == 0) if (timeout-- == 0)
break; break;
......
...@@ -111,9 +111,6 @@ ...@@ -111,9 +111,6 @@
#define EXYNOS_ARM_CORE_STATUS(_nr) \ #define EXYNOS_ARM_CORE_STATUS(_nr) \
(EXYNOS_ARM_CORE_CONFIGURATION(_nr) + 0x4) (EXYNOS_ARM_CORE_CONFIGURATION(_nr) + 0x4)
#define S5P_ARM_CORE1_CONFIGURATION S5P_PMUREG(0x2080)
#define S5P_ARM_CORE1_STATUS S5P_PMUREG(0x2084)
#define S5P_PAD_RET_MAUDIO_OPTION S5P_PMUREG(0x3028) #define S5P_PAD_RET_MAUDIO_OPTION S5P_PMUREG(0x3028)
#define S5P_PAD_RET_GPIO_OPTION S5P_PMUREG(0x3108) #define S5P_PAD_RET_GPIO_OPTION S5P_PMUREG(0x3108)
#define S5P_PAD_RET_UART_OPTION S5P_PMUREG(0x3128) #define S5P_PAD_RET_UART_OPTION S5P_PMUREG(0x3128)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment