lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[dev][timer][arm_generic] add support for overriding frequency at init time

Browse Source
This commit is contained in:
Travis Geiselbrecht
2015-03-01 18:15:32 -08:00
parent b5943c329d
commit c77cc67d86
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dev/timer/arm_generic/arm_generic_timer.c
View File

@@ -120,6 +120,7 @@ status_t platform_set_oneshot_timer(platform_timer_callback callback, void *arg,
else
write_cntp_cval(read_cntpct() + cntpct_interval);
write_cntp_ctl(1);
return 0;
}
@@ -231,13 +232,19 @@ static void arm_generic_timer_init_conversion_factors(uint32_t cntfrq)
LTRACEF("us_per_cntpct: %08x.%08x%08x\n", us_per_cntpct.l0, us_per_cntpct.l32, us_per_cntpct.l64);
}
void arm_generic_timer_init(int irq)
void arm_generic_timer_init(int irq, uint32_t freq_override)
{
uint32_t cntfrq = read_cntfrq();
uint32_t cntfrq;
if (!cntfrq) {
TRACEF("Failed to initialize timer, frequency is 0\n");
return;
if (freq_override == 0) {
cntfrq = read_cntfrq();
if (!cntfrq) {
TRACEF("Failed to initialize timer, frequency is 0\n");
return;
}
} else {
cntfrq = freq_override;
}
#if LOCAL_TRACE
@@ -256,3 +263,4 @@ void arm_generic_timer_init(int irq)
unmask_interrupt(irq);
}
/* vim: set noexpandtab: */

3
dev/timer/arm_generic/include/dev/timer/arm_generic.h
View File

@@ -25,7 +25,8 @@
#include <sys/types.h>
void arm_generic_timer_init(int irq);
/* if freq_override != 0, use that as the operating frequency instead of CNTFRQ register */
void arm_generic_timer_init(int irq, uint32_t freq_override);
void arm_generic_timer_init_secondary_cpu(void);
#endif