summaryrefslogtreecommitdiff
path: root/services/std_svc/psci/psci_suspend.c
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2016-05-24 16:12:08 +0100
committerdanh-arm <dan.handley@arm.com>2016-05-24 16:12:08 +0100
commite141aa0357fd4977ba874f4f86874e2cadc73498 (patch)
treecc01a644b84f7e07215a4920c3053ce4ddfb3f50 /services/std_svc/psci/psci_suspend.c
parentd1d716531db8d52101d9168a79d4b6acaef976fe (diff)
parent6704f425ddb2772bd9a2b9dacacbefcbb00dcf28 (diff)
Merge pull request #625 from antonio-nino-diaz-arm/an/delay-timer-v2
Implement generic delay timer and use it on platforms
Diffstat (limited to 'services/std_svc/psci/psci_suspend.c')
-rw-r--r--services/std_svc/psci/psci_suspend.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/std_svc/psci/psci_suspend.c b/services/std_svc/psci/psci_suspend.c
index bd0c5dbc..367bb32a 100644
--- a/services/std_svc/psci/psci_suspend.c
+++ b/services/std_svc/psci/psci_suspend.c
@@ -214,7 +214,7 @@ exit:
void psci_cpu_suspend_finish(unsigned int cpu_idx,
psci_power_state_t *state_info)
{
- unsigned long long counter_freq;
+ unsigned int counter_freq;
unsigned int max_off_lvl;
/* Ensure we have been woken up from a suspended state */
@@ -238,7 +238,7 @@ void psci_cpu_suspend_finish(unsigned int cpu_idx,
psci_do_pwrup_cache_maintenance();
/* Re-init the cntfrq_el0 register */
- counter_freq = plat_get_syscnt_freq();
+ counter_freq = plat_get_syscnt_freq2();
write_cntfrq_el0(counter_freq);
/*