commit | af617144da407fa447156d10ec0dd0096bc5cbdf | [log] [tgz] |
---|---|---|
author | Soby Mathew <soby.mathew@arm.com> | Tue Oct 08 12:58:48 2019 +0000 |
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | Tue Oct 08 12:58:48 2019 +0000 |
tree | b82d07e8b695ee709ca3030847409d4c25e1677f | |
parent | aadbd541a7b30a995be2614f3260e64401fef11a [diff] | |
parent | af0c914c100fca207c2dab50b74b3d1e0d8bf112 [diff] |
Merge "delay: correct timeout_init_us()" into integration
diff --git a/include/drivers/delay_timer.h b/include/drivers/delay_timer.h index e5044cc..20a5543 100644 --- a/include/drivers/delay_timer.h +++ b/include/drivers/delay_timer.h
@@ -36,7 +36,7 @@ { uint64_t cnt = timeout_cnt_us2cnt(us); - cnt += read_cntfrq_el0(); + cnt += read_cntpct_el0(); return cnt; }