Merge branch 'master' of git://git.denx.de/u-boot-arm

[platform/kernel/u-boot.git] / arch / arm / cpu / arm926ejs / armada100 / timer.c

diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c
index 5d911c5..fbade4b 100644 (file)
--- a/arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
@@ -24,6 +24,7 @@
  */
 
 #include <common.h>
+#include <asm/arch/cpu.h>
 #include <asm/arch/armada100.h>
 
 /*
@@ -77,13 +78,6 @@ ulong read_timer(void)
        return(readl(&armd1timers->cvwr));
 }
 
-void reset_timer_masked(void)
-{
-       /* reset time */
-       gd->tbl = read_timer();
-       gd->tbu = 0;
-}
-
 ulong get_timer_masked(void)
 {
        ulong now = read_timer();
@@ -100,22 +94,12 @@ ulong get_timer_masked(void)
        return gd->tbu;
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer(ulong base)
 {
        return ((get_timer_masked() / (CONFIG_SYS_HZ_CLOCK / 1000)) -
                base);
 }
 
-void set_timer(ulong t)
-{
-       gd->tbu = t;
-}
-
 void __udelay(unsigned long usec)
 {
        ulong delayticks;
@@ -152,7 +136,8 @@ int timer_init(void)
        /* Enable timer 0 */
        writel(0x1, &armd1timers->cer);
        /* init the gd->tbu and gd->tbl value */
-       reset_timer_masked();
+       gd->tbl = read_timer();
+       gd->tbu = 0;
 
        return 0;
 }