Merge tag 'u-boot-imx-20200623' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

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

diff --git a/lib/time.c b/lib/time.c
index 9c55da6f1b3914adde3bf67107896a962bc29d44..65db0f6cda29367c6f4b2eee1666a18a3d578100 100644 (file)
--- a/lib/time.c
+++ b/lib/time.c
@@ -5,12 +5,16 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
+#include <time.h>
 #include <timer.h>
 #include <watchdog.h>
 #include <div64.h>
 #include <asm/io.h>
+#include <linux/delay.h>
 
 #ifndef CONFIG_WD_PERIOD
 # define CONFIG_WD_PERIOD      (10 * 1000 * 1000)      /* 10 seconds default */
@@ -134,12 +138,26 @@ ulong __weak get_timer(ulong base)
        return tick_to_time(get_ticks()) - base;
 }
 
+static uint64_t notrace tick_to_time_us(uint64_t tick)
+{
+       ulong div = get_tbclk() / 1000;
+
+       tick *= CONFIG_SYS_HZ;
+       do_div(tick, div);
+       return tick;
+}
+
+uint64_t __weak get_timer_us(uint64_t base)
+{
+       return tick_to_time_us(get_ticks()) - base;
+}
+
 unsigned long __weak notrace timer_get_us(void)
 {
        return tick_to_time(get_ticks() * 1000);
 }
 
-static uint64_t usec_to_tick(unsigned long usec)
+uint64_t usec_to_tick(unsigned long usec)
 {
        uint64_t tick = usec;
        tick *= get_tbclk();
@@ -166,7 +184,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);
 }