svn_rev_596

remove usec2ticks and ticks2usec

1 files changed, 2 insertions, 39 deletions

diff --git a/arch/ppc/lib/time.c b/arch/ppc/lib/time.c
index a66f57ba98..9e73500430 100644
--- a/arch/ppc/lib/time.c
+++ b/arch/ppc/lib/time.c
@@ -24,44 +24,7 @@
 #include <common.h>
 #include <clock.h>
 #include <init.h>
-
-/* ------------------------------------------------------------------------- */
-
-/*
- * This function is intended for SHORT delays only.
- * It will overflow at around 10 seconds @ 400MHz,
- * or 20 seconds @ 200MHz.
- */
-unsigned long usec2ticks(unsigned long usec)
-{
-	ulong ticks;
-
-	if (usec < 1000) {
-		ticks = ((usec * (get_tbclk()/1000)) + 500) / 1000;
-	} else {
-		ticks = ((usec / 10) * (get_tbclk() / 100000));
-	}
-
-	return (ticks);
-}
-
-/* ------------------------------------------------------------------------- */
-
-unsigned long ticks2usec(unsigned long ticks)
-{
-	ulong tbclk = get_tbclk();
-
-	/* usec = ticks * 1000000 / tbclk
-	 * Multiplication would overflow at ~4.2e3 ticks,
-	 * so we break it up into
-	 * usec = ( ( ticks * 1000) / tbclk ) * 1000;
-	 */
-	ticks *= 1000L;
-	ticks /= tbclk;
-	ticks *= 1000L;
-
-	return ((ulong)ticks);
-}
+#include <asm/arch/clocks.h>
 
 /* ------------------------------------------------------------------------- */
 
@@ -100,7 +63,7 @@ static int clocksource_init (void)
 {
 	init_timebase();
 
-        cs.mult = clocksource_hz2mult(get_tbclk(), cs.shift);
+        cs.mult = clocksource_hz2mult(get_timebase_clock(), cs.shift);
 
         init_clock(&cs);