diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-03-21 11:15:56 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-07-01 11:05:15 +0100 |
| commit | e64a97aa17f483b616b9adc93e74daee1eabf4a0 (patch) | |
| tree | a891952549679f89b68b9904a7e6ca16734c2c41 | |
| parent | 4997791921e168d5bd8dd707deb360f6d32f5d7e (diff) | |
ARM: vexpress: Fixup tc2_pm_psci.c for mcpm APIs
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | arch/arm/mach-vexpress/tc2_pm_psci.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-vexpress/tc2_pm_psci.c b/arch/arm/mach-vexpress/tc2_pm_psci.c index c9715b8137e..04d83d2965f 100644 --- a/arch/arm/mach-vexpress/tc2_pm_psci.c +++ b/arch/arm/mach-vexpress/tc2_pm_psci.c @@ -17,7 +17,7 @@ #include <linux/spinlock.h> #include <linux/errno.h> -#include <asm/bL_entry.h> +#include <asm/mcpm.h> #include <asm/proc-fns.h> #include <asm/cacheflush.h> #include <asm/psci.h> @@ -53,7 +53,7 @@ static int tc2_pm_psci_power_up(unsigned int cpu, unsigned int cluster) */ do ret = psci_ops.cpu_on(mpidr, - virt_to_phys(bL_entry_point)); + virt_to_phys(mcpm_entry_point)); while (ret == -EAGAIN); return ret; @@ -129,13 +129,13 @@ static void tc2_pm_psci_suspend(u64 unused) power_state.type = PSCI_POWER_STATE_TYPE_POWER_DOWN; power_state.affinity_level = PSCI_POWER_STATE_AFFINITY_LEVEL1; - psci_ops.cpu_suspend(power_state, virt_to_phys(bL_entry_point)); + psci_ops.cpu_suspend(power_state, virt_to_phys(mcpm_entry_point)); /* On success this function never returns */ BUG(); } -static const struct bL_platform_power_ops tc2_pm_power_ops = { +static const struct mcpm_platform_ops tc2_pm_power_ops = { .power_up = tc2_pm_psci_power_up, .power_down = tc2_pm_psci_power_down, .suspend = tc2_pm_psci_suspend, @@ -168,9 +168,9 @@ static int __init tc2_pm_psci_init(void) tc2_pm_usage_count_init(); - ret = bL_platform_power_register(&tc2_pm_power_ops); + ret = mcpm_platform_register(&tc2_pm_power_ops); if (!ret) - ret = bL_cluster_sync_init(NULL); + ret = mcpm_sync_init(NULL); if (!ret) pr_info("TC2 power management initialized\n"); return ret; |