dtoc: Make use of node properties

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

diff --git a/lib/time.c b/lib/time.c
index 75de48f90032cc1f213fedd5ca57c263cd2b1c9d..38a9758292a5ef4182466d62df22de7e2606f61e 100644 (file)
--- a/lib/time.c
+++ b/lib/time.c
@@ -5,13 +5,18 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
+#include <spl.h>
 #include <time.h>
 #include <timer.h>
 #include <watchdog.h>
 #include <div64.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
+#include <linux/delay.h>
 
 #ifndef CONFIG_WD_PERIOD
 # define CONFIG_WD_PERIOD      (10 * 1000 * 1000)      /* 10 seconds default */
@@ -88,13 +93,18 @@ uint64_t notrace get_ticks(void)
 
                ret = dm_timer_init();
                if (ret)
-                       return ret;
+                       panic("Could not initialize timer (err %d)\n", ret);
 #endif
        }
 
        ret = timer_get_count(gd->timer, &count);
-       if (ret)
-               return ret;
+       if (ret) {
+               if (spl_phase() > PHASE_TPL)
+                       panic("Could not read count from timer (err %d)\n",
+                             ret);
+               else
+                       panic("no timer (err %d)\n", ret);
+       }
 
        return count;
 }
@@ -149,6 +159,11 @@ uint64_t __weak get_timer_us(uint64_t base)
        return tick_to_time_us(get_ticks()) - base;
 }
 
+unsigned long __weak get_timer_us_long(unsigned long base)
+{
+       return timer_get_us() - base;
+}
+
 unsigned long __weak notrace timer_get_us(void)
 {
        return tick_to_time(get_ticks() * 1000);
@@ -181,7 +196,7 @@ void udelay(unsigned long usec)
        do {
                WATCHDOG_RESET();
                kv = usec > CONFIG_WD_PERIOD ? CONFIG_WD_PERIOD : usec;
-               __udelay (kv);
+               __udelay(kv);
                usec -= kv;
        } while(usec);
 }