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

[oweals/u-boot.git] / lib / time.c

diff --git a/lib/time.c b/lib/time.c
index 477440de16faa3319852a6119935628f63aa8531..3c49243e6a1ee0f3c7f95d73e9b081581e44be36 100644 (file)
--- a/lib/time.c
+++ b/lib/time.c
@@ -6,6 +6,9 @@
  */
 
 #include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <timer.h>
 #include <watchdog.h>
 #include <div64.h>
 #include <asm/io.h>
@@ -37,6 +40,50 @@ unsigned long notrace timer_read_counter(void)
 extern unsigned long __weak timer_read_counter(void);
 #endif
 
+#ifdef CONFIG_TIMER
+ulong notrace get_tbclk(void)
+{
+       if (!gd->timer) {
+#ifdef CONFIG_TIMER_EARLY
+               return timer_early_get_rate();
+#else
+               int ret;
+
+               ret = dm_timer_init();
+               if (ret)
+                       return ret;
+#endif
+       }
+
+       return timer_get_rate(gd->timer);
+}
+
+uint64_t notrace get_ticks(void)
+{
+       u64 count;
+       int ret;
+
+       if (!gd->timer) {
+#ifdef CONFIG_TIMER_EARLY
+               return timer_early_get_count();
+#else
+               int ret;
+
+               ret = dm_timer_init();
+               if (ret)
+                       return ret;
+#endif
+       }
+
+       ret = timer_get_count(gd->timer, &count);
+       if (ret)
+               return ret;
+
+       return count;
+}
+
+#else /* !CONFIG_TIMER */
+
 uint64_t __weak notrace get_ticks(void)
 {
        unsigned long now = timer_read_counter();
@@ -48,6 +95,8 @@ uint64_t __weak notrace get_ticks(void)
        return ((uint64_t)gd->timebase_h << 32) | gd->timebase_l;
 }
 
+#endif /* CONFIG_TIMER */
+
 /* Returns time in milliseconds */
 static uint64_t notrace tick_to_time(uint64_t tick)
 {
@@ -105,9 +154,3 @@ void udelay(unsigned long usec)
                usec -= kv;
        } while(usec);
 }
-
-void mdelay(unsigned long msec)
-{
-       while (msec--)
-               udelay(1000);
-}