Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / board / armltd / integrator / timer.c

diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c
index f77edad4ffa73db2c70aa3165c32bda2047df29e..d220b877d66181812a601a09937de4cb109e862e 100644 (file)
--- a/board/armltd/integrator/timer.c
+++ b/board/armltd/integrator/timer.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002
  * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
@@ -13,12 +14,12 @@
  * (C) Copyright 2004
  * ARM Ltd.
  * Philippe Robin, <philippe.robin@arm.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+ 
  */
 
 #include <common.h>
 #include <div64.h>
+#include <time.h>
+#include <linux/delay.h>
 
 #ifdef CONFIG_ARCH_CINTEGRATOR
 #define DIV_CLOCK_INIT 1
@@ -94,31 +95,10 @@ int timer_init (void)
 /*
  * timer without interrupts
  */
-ulong get_timer (ulong base_ticks)
-{
-       return get_timer_masked () - base_ticks;
-}
-
-/* delay usec useconds */
-void __udelay (unsigned long usec)
-{
-       ulong tmo, tmp;
-
-       /* Convert to U-Boot ticks */
-       tmo  = usec * CONFIG_SYS_HZ;
-       tmo /= (1000000L);
-
-       tmp  = get_timer_masked();      /* get current timestamp */
-       tmo += tmp;                     /* form target timestamp */
-
-       while (get_timer_masked () < tmo) {/* loop till event */
-               /*NOP*/;
-       }
-}
 
 /* converts the timer reading to U-Boot ticks         */
 /* the timestamp is the number of ticks since reset    */
-ulong get_timer_masked (void)
+static ulong get_timer_masked (void)
 {
        /* get current count */
        unsigned long long now = READ_TIMER;
@@ -139,10 +119,26 @@ ulong get_timer_masked (void)
        return timestamp;
 }
 
-/* waits specified delay value and resets timestamp */
-void udelay_masked (unsigned long usec)
+ulong get_timer (ulong base_ticks)
+{
+       return get_timer_masked () - base_ticks;
+}
+
+/* delay usec useconds */
+void __udelay(unsigned long usec)
 {
-       udelay(usec);
+       ulong tmo, tmp;
+
+       /* Convert to U-Boot ticks */
+       tmo  = usec * CONFIG_SYS_HZ;
+       tmo /= (1000000L);
+
+       tmp  = get_timer_masked();      /* get current timestamp */
+       tmo += tmp;                     /* form target timestamp */
+
+       while (get_timer_masked () < tmo) {/* loop till event */
+               /*NOP*/;
+       }
 }
 
 /*
@@ -158,7 +154,7 @@ unsigned long long get_ticks(void)
  * Return the timebase clock frequency
  * i.e. how often the timer decrements
  */
-ulong get_tbclk (void)
+ulong get_tbclk(void)
 {
        unsigned long long tmp = CONFIG_SYS_HZ_CLOCK;