X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=lib%2Ftime.c;h=f37150fddc150db21c5b147bfe8b6fffccc08498;hb=519d9424c33026677868e3b29203120261516996;hp=f37a6628d6e80d56e36d4cbaab4f0481a3a3048f;hpb=f1993ca066100fcaba7d49fecae0ef604e5807e2;p=u-boot

diff --git a/lib/time.c b/lib/time.c
index f37a6628d6..f37150fddc 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -41,31 +41,20 @@ extern unsigned long __weak timer_read_counter(void);
 #endif
 
 #ifdef CONFIG_TIMER
-static int notrace dm_timer_init(void)
+ulong notrace get_tbclk(void)
 {
-	struct udevice *dev;
-	int ret;
-
 	if (!gd->timer) {
-		ret = uclass_first_device(UCLASS_TIMER, &dev);
+#ifdef CONFIG_TIMER_EARLY
+		return timer_early_get_rate();
+#else
+		int ret;
+
+		ret = dm_timer_init();
 		if (ret)
 			return ret;
-		if (!dev)
-			return -ENODEV;
-		gd->timer = dev;
+#endif
 	}
 
-	return 0;
-}
-
-ulong notrace get_tbclk(void)
-{
-	int ret;
-
-	ret = dm_timer_init();
-	if (ret)
-		return ret;
-
 	return timer_get_rate(gd->timer);
 }
 
@@ -74,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)