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

[u-boot] / arch / arm / cpu / arm1176 / tnetv107x / timer.c

diff --git a/arch/arm/cpu/arm1176/tnetv107x/timer.c b/arch/arm/cpu/arm1176/tnetv107x/timer.c
index a7a400d1e12b56f1656f52362a10d416f3c70e9f..b3123c531fa4ab24ba930a17f3520a1340e004db 100644 (file)
--- a/arch/arm/cpu/arm1176/tnetv107x/timer.c
+++ b/arch/arm/cpu/arm1176/tnetv107x/timer.c
@@ -60,15 +60,6 @@ int timer_init(void)
        return 0;
 }
 
-void reset_timer(void)
-{
-       lastinc = timestamp = 0;
-
-       __raw_writel(0,         &regs->tcr);
-       __raw_writel(0,         &regs->tim34);
-       __raw_writel(2 << 22,   &regs->tcr);
-}
-
 static ulong get_timer_raw(void)
 {
        ulong now = __raw_readl(&regs->tim34);
@@ -88,11 +79,6 @@ ulong get_timer(ulong base)
        return (get_timer_raw() / (TIMER_LOAD_VAL / TIM_CLK_DIV)) - base;
 }
 
-void set_timer(ulong t)
-{
-       timestamp = t;
-}
-
 unsigned long long get_ticks(void)
 {
        return get_timer(0);