diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-31 13:43:05 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-07-01 11:05:14 +0100 |
| commit | dd94c6f646873c2f16b70e1cc82451fe1c2a83c6 (patch) | |
| tree | cea38fe44942eedadf861de2023a3052fc7f0f00 | |
| parent | 5ecac7d2203156ab963db3b5c34712395f83562b (diff) | |
tc2_pm: Fixup for new SPC driver
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | arch/arm/mach-vexpress/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-vexpress/tc2_pm.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig index 1ce8798e7ee..d8b86861a7d 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig @@ -60,7 +60,7 @@ config ARCH_VEXPRESS_CA9X4 config ARCH_VEXPRESS_TC2 bool "TC2 cluster management" depends on MCPM - select ARM_SPC + select VEXPRESS_SPC select ARM_CCI help Support for CPU and cluster power management on TC2. diff --git a/arch/arm/mach-vexpress/tc2_pm.c b/arch/arm/mach-vexpress/tc2_pm.c index d2f84272ae8..aa866e5f9ea 100644 --- a/arch/arm/mach-vexpress/tc2_pm.c +++ b/arch/arm/mach-vexpress/tc2_pm.c @@ -59,7 +59,7 @@ static int tc2_pm_power_up(unsigned int cpu, unsigned int cluster) tc2_pm_use_count[cpu][cluster]++; if (tc2_pm_use_count[cpu][cluster] == 1) { - vexpress_spc_write_bxaddr_reg(cluster, cpu, + vexpress_spc_write_resume_reg(cluster, cpu, virt_to_phys(mcpm_entry_point)); vexpress_spc_set_cpu_wakeup_irq(cpu, cluster, 1); } else if (tc2_pm_use_count[cpu][cluster] != 2) { @@ -178,7 +178,7 @@ static void tc2_pm_suspend(u64 residency) mpidr = read_cpuid_mpidr(); cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0); cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1); - vexpress_spc_write_bxaddr_reg(cluster, cpu, + vexpress_spc_write_resume_reg(cluster, cpu, virt_to_phys(tc2_resume)); tc2_pm_down(residency); @@ -210,7 +210,7 @@ static void tc2_pm_powered_up(void) tc2_pm_use_count[cpu][cluster] = 1; vexpress_spc_set_cpu_wakeup_irq(cpu, cluster, 0); - vexpress_spc_write_bxaddr_reg(cluster, cpu, 0); + vexpress_spc_write_resume_reg(cluster, cpu, 0); arch_spin_unlock(&tc2_pm_lock); local_irq_restore(flags); |