tc2_pm: Fixup for new SPC driver

Signed-off-by: Jon Medhurst <tixy@linaro.org>

diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 1ce8798e7ee2698111cd153c56e4d26ad82130ba..d8b86861a7d0ab03cac97aadb9d6f51f8df3ac22 100644 (file)
--- 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 d2f84272ae8576fa197cb1e2fb95a910f65a15f2..aa866e5f9eac33b093ddf73d7b2907c60819627b 100644 (file)
--- 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);