diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-22 14:36:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-22 14:36:47 -0400 |
| commit | ae4fdd7b0432bcb0bc2fe7d90b6d3e92001ab478 (patch) | |
| tree | e933e67609989d0e4960f1464384e9ff40732b30 /drivers/timer/tsc_timer.c | |
| parent | b90daf2743b38022bea8727ede867ad63e971db2 (diff) | |
| parent | dddfde5401ed5ad82c996b35b61dc4a45bb4e2b3 (diff) | |
Merge branch '2020-10-22-misc-changes'
- Assorted updates for Xen, IPQ40xx, ASpeed, Keymile
- Assorted typo / documentation fixes
- Fix default preboot cmd to act like before with USB_STORAGE set
- A number of other bugfixes throughout the code
Diffstat (limited to 'drivers/timer/tsc_timer.c')
| -rw-r--r-- | drivers/timer/tsc_timer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c index 93c959ff444..abc0a1da05e 100644 --- a/drivers/timer/tsc_timer.c +++ b/drivers/timer/tsc_timer.c @@ -386,13 +386,11 @@ void __udelay(unsigned long usec) #endif } -static int tsc_timer_get_count(struct udevice *dev, u64 *count) +static u64 tsc_timer_get_count(struct udevice *dev) { u64 now_tick = rdtsc(); - *count = now_tick - gd->arch.tsc_base; - - return 0; + return now_tick - gd->arch.tsc_base; } static void tsc_timer_ensure_setup(bool early) |