mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 08:30:50 +09:00
sh: convert to common timer code
Convert sh to use the commmon timer code. Remove reset_timer and set_timer as they are unused on sh. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
This commit is contained in:
parent
8dfafdde88
commit
1b5cf9549f
@ -12,7 +12,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <div64.h>
|
|
||||||
#include <asm/processor.h>
|
#include <asm/processor.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <sh_tmu.h>
|
#include <sh_tmu.h>
|
||||||
@ -21,29 +20,15 @@
|
|||||||
|
|
||||||
static struct tmu_regs *tmu = (struct tmu_regs *)TMU_BASE;
|
static struct tmu_regs *tmu = (struct tmu_regs *)TMU_BASE;
|
||||||
|
|
||||||
static unsigned long last_tcnt;
|
|
||||||
static unsigned long long overflow_ticks;
|
|
||||||
|
|
||||||
unsigned long get_tbclk(void)
|
unsigned long get_tbclk(void)
|
||||||
{
|
{
|
||||||
u16 tmu_bit = (ffs(CONFIG_SYS_TMU_CLK_DIV) >> 1) - 1;
|
u16 tmu_bit = (ffs(CONFIG_SYS_TMU_CLK_DIV) >> 1) - 1;
|
||||||
return get_tmu0_clk_rate() >> ((tmu_bit + 1) * 2);
|
return get_tmu0_clk_rate() >> ((tmu_bit + 1) * 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline unsigned long long tick_to_time(unsigned long long tick)
|
unsigned long timer_read_counter(void)
|
||||||
{
|
{
|
||||||
tick *= CONFIG_SYS_HZ;
|
return ~readl(&tmu->tcnt0);
|
||||||
do_div(tick, get_tbclk());
|
|
||||||
|
|
||||||
return tick;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline unsigned long long usec_to_tick(unsigned long long usec)
|
|
||||||
{
|
|
||||||
usec *= get_tbclk();
|
|
||||||
do_div(usec, 1000000);
|
|
||||||
|
|
||||||
return usec;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void tmu_timer_start(unsigned int timer)
|
static void tmu_timer_start(unsigned int timer)
|
||||||
@ -68,49 +53,6 @@ int timer_init(void)
|
|||||||
tmu_timer_stop(0);
|
tmu_timer_stop(0);
|
||||||
tmu_timer_start(0);
|
tmu_timer_start(0);
|
||||||
|
|
||||||
last_tcnt = 0;
|
|
||||||
overflow_ticks = 0;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long long get_ticks(void)
|
|
||||||
{
|
|
||||||
unsigned long tcnt = 0 - readl(&tmu->tcnt0);
|
|
||||||
|
|
||||||
if (last_tcnt > tcnt) /* overflow */
|
|
||||||
overflow_ticks++;
|
|
||||||
last_tcnt = tcnt;
|
|
||||||
|
|
||||||
return (overflow_ticks << 32) | tcnt;
|
|
||||||
}
|
|
||||||
|
|
||||||
void __udelay(unsigned long usec)
|
|
||||||
{
|
|
||||||
unsigned long long tmp;
|
|
||||||
ulong tmo;
|
|
||||||
|
|
||||||
tmo = usec_to_tick(usec);
|
|
||||||
tmp = get_ticks() + tmo; /* get current timestamp */
|
|
||||||
|
|
||||||
while (get_ticks() < tmp) /* loop till event */
|
|
||||||
/*NOP*/;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned long get_timer(unsigned long base)
|
|
||||||
{
|
|
||||||
/* return msec */
|
|
||||||
return tick_to_time(get_ticks()) - base;
|
|
||||||
}
|
|
||||||
|
|
||||||
void set_timer(unsigned long t)
|
|
||||||
{
|
|
||||||
writel((0 - t), &tmu->tcnt0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void reset_timer(void)
|
|
||||||
{
|
|
||||||
tmu_timer_stop(0);
|
|
||||||
set_timer(0);
|
|
||||||
tmu_timer_start(0);
|
|
||||||
}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user