diff options
| -rw-r--r-- | arch/arm/mach-rockchip/rk_timer.c | 7 | ||||
| -rw-r--r-- | include/time.h | 9 | ||||
| -rw-r--r-- | lib/time.c | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/arch/arm/mach-rockchip/rk_timer.c b/arch/arm/mach-rockchip/rk_timer.c index f20e64f48e..29d379fa0a 100644 --- a/arch/arm/mach-rockchip/rk_timer.c +++ b/arch/arm/mach-rockchip/rk_timer.c @@ -20,13 +20,6 @@ static uint64_t rockchip_get_ticks(void) return timebase_h << 32 | timebase_l; } -static uint64_t usec_to_tick(unsigned int usec) -{ - uint64_t tick = usec; - tick *= CONFIG_SYS_TIMER_RATE / (1000 * 1000); - return tick; -} - void rockchip_udelay(unsigned int usec) { uint64_t tmp; diff --git a/include/time.h b/include/time.h index 9fd0d73fb4..1e9b369be7 100644 --- a/include/time.h +++ b/include/time.h @@ -4,6 +4,7 @@ #define _TIME_H #include <linux/typecheck.h> +#include <linux/types.h> unsigned long get_timer(unsigned long base); @@ -21,6 +22,14 @@ unsigned long timer_get_us(void); */ void timer_test_add_offset(unsigned long offset); +/** + * usec_to_tick() - convert microseconds to clock ticks + * + * @usec: duration in microseconds + * Return: duration in clock ticks + */ +uint64_t usec_to_tick(unsigned long usec); + /* * These inlines deal with timer wrapping correctly. You are * strongly encouraged to use them diff --git a/lib/time.c b/lib/time.c index 9c55da6f1b..f5751ab162 100644 --- a/lib/time.c +++ b/lib/time.c @@ -139,7 +139,7 @@ unsigned long __weak notrace timer_get_us(void) return tick_to_time(get_ticks() * 1000); } -static uint64_t usec_to_tick(unsigned long usec) +uint64_t usec_to_tick(unsigned long usec) { uint64_t tick = usec; tick *= get_tbclk(); |