Merge "delay: correct timeout_init_us()" into integration
authorSoby Mathew <soby.mathew@arm.com>
Tue, 8 Oct 2019 12:58:48 +0000 (12:58 +0000)
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>
Tue, 8 Oct 2019 12:58:48 +0000 (12:58 +0000)
include/drivers/delay_timer.h

index e5044cc6e17e8b86383090447111b2d3c1f7ed33..20a55435702330533f5927547fe16a51d84e8fbd 100644 (file)
@@ -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;
 }