summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoby Mathew <soby.mathew@arm.com>2019-10-08 12:58:48 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2019-10-08 12:58:48 +0000
commit1d880258e1d43340e3d02bbee0a3b248ad8605b1 (patch)
treeb82d07e8b695ee709ca3030847409d4c25e1677f
parent80003d86a60272ef82b8bca3c71ee358222b825b (diff)
parent9d811b856ec1d10a1285aa2c43c3e1f3a411d54b (diff)
Merge "delay: correct timeout_init_us()" into integration
-rw-r--r--include/drivers/delay_timer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drivers/delay_timer.h b/include/drivers/delay_timer.h
index e5044cc6..20a55435 100644
--- a/include/drivers/delay_timer.h
+++ b/include/drivers/delay_timer.h
@@ -36,7 +36,7 @@ static inline uint64_t timeout_init_us(uint32_t us)
{
uint64_t cnt = timeout_cnt_us2cnt(us);
- cnt += read_cntfrq_el0();
+ cnt += read_cntpct_el0();
return cnt;
}