Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / lib / time.c

diff --git a/lib/time.c b/lib/time.c
index 111b493a420d65c462e70747b5830aa51c45da0e..477440de16faa3319852a6119935628f63aa8531 100644 (file)
--- a/lib/time.c
+++ b/lib/time.c
@@ -10,17 +10,14 @@
 #include <div64.h>
 #include <asm/io.h>
 
-#if CONFIG_SYS_HZ != 1000
-#warning "CONFIG_SYS_HZ must be 1000 and should not be defined by platforms"
-#endif
-
 #ifndef CONFIG_WD_PERIOD
-# define CONFIG_WD_PERIOD      (10 * 1000 * 1000)      /* 10 seconds default*/
+# define CONFIG_WD_PERIOD      (10 * 1000 * 1000)      /* 10 seconds default */
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_SYS_TIMER_RATE
+/* Returns tick rate in ticks per second */
 ulong notrace get_tbclk(void)
 {
        return CONFIG_SYS_TIMER_RATE;
@@ -40,7 +37,7 @@ unsigned long notrace timer_read_counter(void)
 extern unsigned long __weak timer_read_counter(void);
 #endif
 
-unsigned long long __weak notrace get_ticks(void)
+uint64_t __weak notrace get_ticks(void)
 {
        unsigned long now = timer_read_counter();
 
@@ -48,18 +45,25 @@ unsigned long long __weak notrace get_ticks(void)
        if (now < gd->timebase_l)
                gd->timebase_h++;
        gd->timebase_l = now;
-       return ((unsigned long long)gd->timebase_h << 32) | gd->timebase_l;
+       return ((uint64_t)gd->timebase_h << 32) | gd->timebase_l;
 }
 
-static unsigned long long notrace tick_to_time(unsigned long long tick)
+/* Returns time in milliseconds */
+static uint64_t notrace tick_to_time(uint64_t tick)
 {
-       unsigned int div = get_tbclk();
+       ulong div = get_tbclk();
 
        tick *= CONFIG_SYS_HZ;
        do_div(tick, div);
        return tick;
 }
 
+int __weak timer_init(void)
+{
+       return 0;
+}
+
+/* Returns time in milliseconds */
 ulong __weak get_timer(ulong base)
 {
        return tick_to_time(get_ticks()) - base;
@@ -69,23 +73,22 @@ unsigned long __weak notrace timer_get_us(void)
 {
        return tick_to_time(get_ticks() * 1000);
 }
-static unsigned long long usec_to_tick(unsigned long usec)
+
+static uint64_t usec_to_tick(unsigned long usec)
 {
-       unsigned long long tick = usec * get_tbclk();
-       usec *= get_tbclk();
+       uint64_t tick = usec;
+       tick *= get_tbclk();
        do_div(tick, 1000000);
        return tick;
 }
 
 void __weak __udelay(unsigned long usec)
 {
-       unsigned long long tmp;
-       ulong tmo;
+       uint64_t tmp;
 
-       tmo = usec_to_tick(usec);
-       tmp = get_ticks() + tmo;        /* get current timestamp */
+       tmp = get_ticks() + usec_to_tick(usec); /* get current timestamp */
 
-       while (get_ticks() < tmp)       /* loop till event */
+       while (get_ticks() < tmp+1)     /* loop till event */
                 /*NOP*/;
 }