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

[people/ms/u-boot.git] / lib / time.c

diff --git a/lib/time.c b/lib/time.c
index e9f6861b9843773f780ec3bd278340dcb55a2a2e..3c49243e6a1ee0f3c7f95d73e9b081581e44be36 100644 (file)
--- a/lib/time.c
+++ b/lib/time.c
@@ -43,11 +43,17 @@ extern unsigned long __weak timer_read_counter(void);
 #ifdef CONFIG_TIMER
 ulong notrace get_tbclk(void)
 {
-       int ret;
+       if (!gd->timer) {
+#ifdef CONFIG_TIMER_EARLY
+               return timer_early_get_rate();
+#else
+               int ret;
 
-       ret = dm_timer_init();
-       if (ret)
-               return ret;
+               ret = dm_timer_init();
+               if (ret)
+                       return ret;
+#endif
+       }
 
        return timer_get_rate(gd->timer);
 }
@@ -57,9 +63,17 @@ uint64_t notrace get_ticks(void)
        u64 count;
        int ret;
 
-       ret = dm_timer_init();
-       if (ret)
-               return 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)
@@ -140,9 +154,3 @@ void udelay(unsigned long usec)
                usec -= kv;
        } while(usec);
 }
-
-void mdelay(unsigned long msec)
-{
-       while (msec--)
-               udelay(1000);
-}