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

[u-boot] / arch / sh / lib / time_sh2.c

diff --git a/arch/sh/lib/time_sh2.c b/arch/sh/lib/time_sh2.c
index 789b46f0e0261273cfb2545f34bfc3254a7be29c..58271186e2c862dcbe5de16e1c81a8c6065788ab 100644 (file)
--- a/arch/sh/lib/time_sh2.c
+++ b/arch/sh/lib/time_sh2.c
@@ -54,7 +54,7 @@ int timer_init(void)
 
        /* User Device 0 only */
        cmt_timer_stop(0);
-       set_timer(CMT_TIMER_RESET);
+       writew(CMT_TIMER_RESET, CMCOR_0);
        cmt_timer_start(0);
 
        return 0;
@@ -90,19 +90,6 @@ ulong get_timer(ulong base)
        return (get_usec() / 1000) - base;
 }
 
-void set_timer(ulong t)
-{
-       writew((u16) t, CMCOR_0);
-}
-
-void reset_timer(void)
-{
-       cmt_timer_stop(0);
-       set_timer(CMT_TIMER_RESET);
-       cmt0_timer = 0;
-       cmt_timer_start(0);
-}
-
 void __udelay(unsigned long usec)
 {
        unsigned long end = get_usec() + usec;