summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-10-04 10:22:42 -0500
committerTom Rini <trini@ti.com>2013-11-04 11:08:10 -0500
commit1b5cf9549fe59e000dd8eff80eedafedf736fa3b (patch)
treec7297d5cd2c42b167678007f7cc5c7aa28c9f20a /arch
parent8dfafdde88eb3e71d5569846396ae67a91017232 (diff)
downloadu-boot-imx-1b5cf9549fe59e000dd8eff80eedafedf736fa3b.zip
u-boot-imx-1b5cf9549fe59e000dd8eff80eedafedf736fa3b.tar.gz
u-boot-imx-1b5cf9549fe59e000dd8eff80eedafedf736fa3b.tar.bz2
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/lib/time.c62
1 files changed, 2 insertions, 60 deletions
diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c
index c554fe8..d970a1e 100644
--- a/arch/sh/lib/time.c
+++ b/arch/sh/lib/time.c
@@ -12,7 +12,6 @@
*/
#include <common.h>
-#include <div64.h>
#include <asm/processor.h>
#include <asm/io.h>
#include <sh_tmu.h>
@@ -21,29 +20,15 @@
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)
{
u16 tmu_bit = (ffs(CONFIG_SYS_TMU_CLK_DIV) >> 1) - 1;
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;
- 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;
+ return ~readl(&tmu->tcnt0);
}
static void tmu_timer_start(unsigned int timer)
@@ -68,49 +53,6 @@ int timer_init(void)
tmu_timer_stop(0);
tmu_timer_start(0);
- last_tcnt = 0;
- overflow_ticks = 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);
-}