Timer: Remove reset_timer_masked()

In some circumstances, reset_timer_masked() was called be timer_init() in
order to perform architecture specific timer initialisation. In such
cases, the required code in reset_timer_masked() has been moved into
timer_init()

diff --git a/arch/arm/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c
index eac4ffb648819367e92920ab2729ae8800041cb7..c05a39d084ad47f5803b2494ebbbb85fe56d324e 100644 (file)
--- a/arch/arm/cpu/arm1136/mx31/timer.c
+++ b/arch/arm/cpu/arm1136/mx31/timer.c
@@ -106,13 +106,6 @@ int timer_init (void)
        return 0;
 }
 
-void reset_timer_masked (void)
-{
-       /* reset time */
-       gd->lastinc = GPTCNT; /* capture current incrementer value time */
-       gd->tbl = 0; /* start "advancing" time stamp from 0 */
-}
-
 unsigned long long get_ticks (void)
 {
        ulong now = GPTCNT; /* current tick value */

diff --git a/arch/arm/cpu/arm1136/omap24xx/timer.c b/arch/arm/cpu/arm1136/omap24xx/timer.c
index 6f1ebbf10f7e5639f3ae6ca3bbfde6c6ef21b26f..73bf4a7b4c2fe51bbd72cfd4d6a73b0c00e3ef76 100644 (file)
--- a/arch/arm/cpu/arm1136/omap24xx/timer.c
+++ b/arch/arm/cpu/arm1136/omap24xx/timer.c
@@ -41,6 +41,13 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+static void reset_timer_masked (void)
+{
+       /* reset time */
+       gd->lastinc = READ_TIMER;       /* capture current incrementer value time */
+       gd->tbl = 0;                    /* start "advancing" time stamp from 0 */
+}
+
 int timer_init (void)
 {
        int32_t val;
@@ -85,13 +92,6 @@ void __udelay (unsigned long usec)
                /*NOP*/;
 }
 
-void reset_timer_masked (void)
-{
-       /* reset time */
-       gd->lastinc = READ_TIMER;       /* capture current incrementer value time */
-       gd->tbl = 0;                    /* start "advancing" time stamp from 0 */
-}
-
 ulong get_timer_masked (void)
 {
        ulong now = READ_TIMER;         /* current tick value */

diff --git a/arch/arm/cpu/arm1176/s3c64xx/timer.c b/arch/arm/cpu/arm1176/s3c64xx/timer.c
index bc21f86bc36c7a5b84ff9ef634a5d63c24f1450f..f16a37b53cab69d793bbdb836aed94181f623ef3 100644 (file)
--- a/arch/arm/cpu/arm1176/s3c64xx/timer.c
+++ b/arch/arm/cpu/arm1176/s3c64xx/timer.c
@@ -135,13 +135,6 @@ ulong get_tbclk(void)
        return (ulong)(timer_load_val / 100);
 }
 
-void reset_timer_masked(void)
-{
-       /* reset time */
-       lastdec = read_timer();
-       timestamp = 0;
-}
-
 ulong get_timer_masked(void)
 {
        unsigned long long res = get_ticks();

diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c
index 9cd7fee7375efae7caec1acec1f53eb5d59122d4..fa9c5a20bd1f0006c9836c24f9187b3eea491b6d 100644 (file)
--- a/arch/arm/cpu/arm720t/interrupts.c
+++ b/arch/arm/cpu/arm720t/interrupts.c
@@ -233,13 +233,6 @@ void __udelay (unsigned long usec)
 #endif
 }
 
-void reset_timer_masked (void)
-{
-       /* reset time */
-       lastdec = READ_TIMER;
-       timestamp = 0;
-}
-
 ulong get_timer_masked (void)
 {
        ulong now = READ_TIMER;

diff --git a/arch/arm/cpu/arm920t/at91/timer.c b/arch/arm/cpu/arm920t/at91/timer.c
index 374cc2553d850a56bdf0db81ac89666207002943..c321e286405272ad3d6f8a6e590185be77e60f7b 100644 (file)
--- a/arch/arm/cpu/arm920t/at91/timer.c
+++ b/arch/arm/cpu/arm920t/at91/timer.c
@@ -82,14 +82,6 @@ void __udelay(unsigned long usec)
        udelay_masked(usec);
 }
 
-void reset_timer_masked(void)
-{
-       /* reset time */
-       at91_tc_t *tc = (at91_tc_t *) ATMEL_BASE_TC;
-       gd->lastinc = readl(&tc->tc[0].cv) & 0x0000ffff;
-       gd->tbl = 0;
-}
-
 ulong get_timer_raw(void)
 {
        at91_tc_t *tc = (at91_tc_t *) ATMEL_BASE_TC;

diff --git a/arch/arm/cpu/arm920t/at91rm9200/timer.c b/arch/arm/cpu/arm920t/at91rm9200/timer.c
index 9a1ae8569e15c1d92a3f75f0bc9b43e66d6129ea..fbe74b68cda32ec5a01a5165f5c579075fd01822 100644 (file)
--- a/arch/arm/cpu/arm920t/at91rm9200/timer.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/timer.c
@@ -81,13 +81,6 @@ void __udelay (unsigned long usec)
        udelay_masked(usec);
 }
 
-void reset_timer_masked (void)
-{
-       /* reset time */
-       lastinc = READ_TIMER;
-       timestamp = 0;
-}
-
 ulong get_timer_raw (void)
 {
        ulong now = READ_TIMER;

diff --git a/arch/arm/cpu/arm920t/ep93xx/timer.c b/arch/arm/cpu/arm920t/ep93xx/timer.c
index f19ec611d11120554c6dbbeff3c794cf2a23b008..a3990a74ed74e276b92c6b0402418c7b91796564 100644 (file)
--- a/arch/arm/cpu/arm920t/ep93xx/timer.c
+++ b/arch/arm/cpu/arm920t/ep93xx/timer.c
@@ -91,12 +91,6 @@ unsigned long get_timer(unsigned long base)
        return get_timer_masked() - base;
 }
 
-void reset_timer_masked(void)
-{
-       read_timer();
-       timer.ticks = 0;
-}
-
 void __udelay(unsigned long usec)
 {
        unsigned long long target;
@@ -123,7 +117,9 @@ int timer_init(void)
        writel(TIMER_ENABLE | TIMER_CLKSEL,
                &timer_regs->timer3.control);
 
-       reset_timer_masked();
+       /* Reset the timer */
+       read_timer();
+       timer.ticks = 0;
 
        return 0;
 }

diff --git a/arch/arm/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c
index cdb214825ee7953b12dd0e46851b71388c04e8c6..6141bd4977bce0bee8b134929d7b1edf929d7048 100644 (file)
--- a/arch/arm/cpu/arm920t/imx/timer.c
+++ b/arch/arm/cpu/arm920t/imx/timer.c
@@ -43,7 +43,9 @@ int timer_init (void)
        TPRER1 = get_PERCLK1() / 1000000; /* 1 MHz */
        TCTL1 |= TCTL_FRR | (1<<1); /* Freerun Mode, PERCLK1 input */
 
-       reset_timer_masked();
+       /* Reset the timer */
+       TCTL1 &= ~TCTL_TEN;
+       TCTL1 |= TCTL_TEN; /* Enable timer */
 
        return (0);
 }
@@ -56,12 +58,6 @@ ulong get_timer (ulong base)
        return get_timer_masked() - base;
 }
 
-void reset_timer_masked (void)
-{
-       TCTL1 &= ~TCTL_TEN;
-       TCTL1 |= TCTL_TEN; /* Enable timer */
-}
-
 ulong get_timer_masked (void)
 {
        return TCN1;

diff --git a/arch/arm/cpu/arm920t/ks8695/timer.c b/arch/arm/cpu/arm920t/ks8695/timer.c
index c78fd90f4fb9d3620a9c6ddc411a4653451347c8..234fe913e920c6e989789b103c691d47e932ac85 100644 (file)
--- a/arch/arm/cpu/arm920t/ks8695/timer.c
+++ b/arch/arm/cpu/arm920t/ks8695/timer.c
@@ -33,7 +33,11 @@ ulong timer_ticks;
 
 int timer_init (void)
 {
-       reset_timer_masked();
+       /* Set the hadware timer for 1ms */
+       ks8695_write(KS8695_TIMER1, TIMER_COUNT);
+       ks8695_write(KS8695_TIMER1_PCOUNT, TIMER_PULSE);
+       ks8695_write(KS8695_TIMER_CTRL, 0x2);
+       timer_ticks = 0;
 
        return 0;
 }
@@ -46,15 +50,6 @@ int timer_init (void)
 #define        TIMER_COUNT     (TIMER_INTERVAL / 2)
 #define        TIMER_PULSE     TIMER_COUNT
 
-void reset_timer_masked(void)
-{
-       /* Set the hadware timer for 1ms */
-       ks8695_write(KS8695_TIMER1, TIMER_COUNT);
-       ks8695_write(KS8695_TIMER1_PCOUNT, TIMER_PULSE);
-       ks8695_write(KS8695_TIMER_CTRL, 0x2);
-       timer_ticks = 0;
-}
-
 ulong get_timer_masked(void)
 {
        /* Check for timer wrap */

diff --git a/arch/arm/cpu/arm920t/s3c24x0/timer.c b/arch/arm/cpu/arm920t/s3c24x0/timer.c
index 9c71b807af97611628461bd02c27f4280b2a718c..9571870b11b24e8eb0c95d369fbf5e7e148c5e9a 100644 (file)
--- a/arch/arm/cpu/arm920t/s3c24x0/timer.c
+++ b/arch/arm/cpu/arm920t/s3c24x0/timer.c
@@ -101,13 +101,6 @@ void __udelay (unsigned long usec)
                /*NOP*/;
 }
 
-void reset_timer_masked(void)
-{
-       /* reset time */
-       lastdec = READ_TIMER();
-       timestamp = 0;
-}
-
 ulong get_timer_masked(void)
 {
        ulong tmr = get_ticks();

diff --git a/arch/arm/cpu/arm925t/timer.c b/arch/arm/cpu/arm925t/timer.c
index 9c965e04f93f2435785c3e0adebf2a98032ee030..1b9386ba5cf5f0bb25a97abd69d9b003d0844109 100644 (file)
--- a/arch/arm/cpu/arm925t/timer.c
+++ b/arch/arm/cpu/arm925t/timer.c
@@ -56,7 +56,9 @@ int timer_init (void)
                CONFIG_SYS_TIMERBASE + CNTL_TIMER);
 
        /* init the timestamp and lastdec value */
-       reset_timer_masked();
+       lastdec = __raw_readl(CONFIG_SYS_TIMERBASE + READ_TIM) /
+                       (TIMER_CLOCK / CONFIG_SYS_HZ);
+       timestamp = 0;         /* start "advancing" time stamp from 0 */
 
        return 0;
 }
@@ -85,14 +87,6 @@ void __udelay (unsigned long usec)
        }
 }
 
-void reset_timer_masked (void)
-{
-       /* reset time */
-       lastdec = __raw_readl(CONFIG_SYS_TIMERBASE + READ_TIM) /
-                       (TIMER_CLOCK / CONFIG_SYS_HZ);
-       timestamp = 0;         /* start "advancing" time stamp from 0 */
-}
-
 ulong get_timer_masked (void)
 {
        uint32_t now = __raw_readl(CONFIG_SYS_TIMERBASE + READ_TIM) /

diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c
index 86da0ce5b0c9bd0657a3d8624ea6f334f3d4e8f2..82a6d7b72dc8f5ee644049ed83e2f28fe7e43d64 100644 (file)
--- a/arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
@@ -77,13 +77,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();
@@ -142,7 +135,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;
 }

diff --git a/arch/arm/cpu/arm926ejs/kirkwood/timer.c b/arch/arm/cpu/arm926ejs/kirkwood/timer.c
index 5beb3f530ead6f159d5b1c9a174f8b0dedfd002c..b4f6cf87e05f07e237fbc2c2da65357787821735 100644 (file)
--- a/arch/arm/cpu/arm926ejs/kirkwood/timer.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/timer.c
@@ -88,13 +88,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define timestamp gd->tbl
 #define lastdec gd->lastinc
 
-void reset_timer_masked(void)
-{
-       /* reset time */
-       lastdec = READ_TIMER;
-       timestamp = 0;
-}
-
 ulong get_timer_masked(void)
 {
        ulong now = READ_TIMER;
@@ -154,7 +147,8 @@ int timer_init(void)
        writel(cntmrctrl, CNTMR_CTRL_REG);
 
        /* init the timestamp and lastdec value */
-       reset_timer_masked();
+       lastdec = READ_TIMER;
+       timestamp = 0;
 
        return 0;
 }

diff --git a/arch/arm/cpu/arm926ejs/mb86r0x/timer.c b/arch/arm/cpu/arm926ejs/mb86r0x/timer.c
index 5f540858c56c26ed0aa9e2cf4a643525fc330145..8f38056455abf2d74fb65f864600275f56ee24dd 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mb86r0x/timer.c
+++ b/arch/arm/cpu/arm926ejs/mb86r0x/timer.c
@@ -68,7 +68,9 @@ int timer_init(void)
 
        writel(ctrl, &timer->control);
 
-       reset_timer_masked();
+       /* capture current value time */
+       lastdec = readl(&timer->value);
+       timestamp = 0; /* start "advancing" time stamp from 0 */
 
        return 0;
 }
@@ -94,16 +96,6 @@ unsigned long long get_ticks(void)
        return timestamp;
 }
 
-void reset_timer_masked(void)
-{
-       struct mb86r0x_timer * timer = (struct mb86r0x_timer *)
-                                       MB86R0x_TIMER_BASE;
-
-       /* capture current value time */
-       lastdec = readl(&timer->value);
-       timestamp = 0; /* start "advancing" time stamp from 0 */
-}
-
 ulong get_timer_masked(void)
 {
        return tick_to_time(get_ticks());

diff --git a/arch/arm/cpu/arm926ejs/mx25/timer.c b/arch/arm/cpu/arm926ejs/mx25/timer.c
index 0e479ac17fed049299013146671deaeaba4c49c8..5eb2747122d5f2ea9da76a8a2978f62c72edcff9 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mx25/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx25/timer.c
@@ -121,15 +121,6 @@ int timer_init(void)
        return 0;
 }
 
-void reset_timer_masked(void)
-{
-       struct gpt_regs *gpt = (struct gpt_regs *)IMX_GPT1_BASE;
-       /* reset time */
-       /* capture current incrementer value time */
-       lastinc = readl(&gpt->counter);
-       timestamp = 0; /* start "advancing" time stamp from 0 */
-}
-
 unsigned long long get_ticks (void)
 {
        struct gpt_regs *gpt = (struct gpt_regs *)IMX_GPT1_BASE;

diff --git a/arch/arm/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c
index 058dbee29c8b2a57b169bb1e924be6695a363445..df76d1681033b0da82a069eed03a284b1d2d1473 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mx27/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx27/timer.c
@@ -124,15 +124,6 @@ int timer_init(void)
        return 0;
 }
 
-void reset_timer_masked(void)
-{
-       struct gpt_regs *regs = (struct gpt_regs *)IMX_TIM1_BASE;
-       /* reset time */
-       /* capture current incrementer value time */
-       lastinc = readl(&regs->gpt_tcn);
-       timestamp = 0; /* start "advancing" time stamp from 0 */
-}
-
 unsigned long long get_ticks (void)
 {
        struct gpt_regs *regs = (struct gpt_regs *)IMX_TIM1_BASE;

diff --git a/arch/arm/cpu/arm926ejs/orion5x/timer.c b/arch/arm/cpu/arm926ejs/orion5x/timer.c
index 5bc43c8c19b8e025cf9acde398690a8e1363a702..17df68f86a2d54f85b3f303df137e42bdf30995f 100644 (file)
--- a/arch/arm/cpu/arm926ejs/orion5x/timer.c
+++ b/arch/arm/cpu/arm926ejs/orion5x/timer.c
@@ -95,13 +95,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define timestamp gd->tbl
 #define lastdec gd->lastinc
 
-void reset_timer_masked(void)
-{
-       /* reset time */
-       lastdec = read_timer();
-       timestamp = 0;
-}
-
 ulong get_timer_masked(void)
 {
        ulong now = read_timer();
@@ -171,5 +164,6 @@ int timer_init(void)
 void timer_init_r(void)
 {
        /* init the timestamp and lastdec value */
-       reset_timer_masked();
+       lastdec = read_timer();
+       timestamp = 0;
 }

diff --git a/arch/arm/cpu/arm926ejs/pantheon/timer.c b/arch/arm/cpu/arm926ejs/pantheon/timer.c
index 2727adce3d1625bb5e226f121b47bd5d4062d49e..c71162a8be697abedf379296de0f7ed0bd456edf 100644 (file)
--- a/arch/arm/cpu/arm926ejs/pantheon/timer.c
+++ b/arch/arm/cpu/arm926ejs/pantheon/timer.c
@@ -85,13 +85,6 @@ ulong read_timer(void)
        return val;
 }
 
-void reset_timer_masked(void)
-{
-       /* reset time */
-       gd->tbl = read_timer();
-       gd->tbu = 0;
-}
-
 ulong get_timer_masked(void)
 {
        ulong now = read_timer();
@@ -151,7 +144,8 @@ int timer_init(void)
        /* Enable timer 0 */
        writel(0x1, &panthtimers->cer);
        /* init the gd->tbu and gd->tbl value */
-       reset_timer_masked();
+       gd->tbl = read_timer();
+       gd->tbu = 0;
 
        return 0;
 }

diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c
index cbef34fab5c5645304115cbef31444b0efb659d4..1dc78600c2b17d5d688ab4fb10b8f434cff17445 100644 (file)
--- a/arch/arm/cpu/arm926ejs/spear/timer.c
+++ b/arch/arm/cpu/arm926ejs/spear/timer.c
@@ -68,7 +68,9 @@ int timer_init(void)
        /* auto reload, start timer */
        writel(readl(&gpt_regs_p->control) | GPT_ENABLE, &gpt_regs_p->control);
 
-       reset_timer_masked();
+       /* Reset the timer */
+       lastdec = READ_TIMER();
+       timestamp = 0;
 
        return 0;
 }
@@ -97,13 +99,6 @@ void __udelay(unsigned long usec)
                ;
 }
 
-void reset_timer_masked(void)
-{
-       /* reset time */
-       lastdec = READ_TIMER();
-       timestamp = 0;
-}
-
 ulong get_timer_masked(void)
 {
        ulong now = READ_TIMER();

diff --git a/arch/arm/cpu/armv7/mx5/timer.c b/arch/arm/cpu/armv7/mx5/timer.c
index 4525bebacc0594a0c9012f66dfbc2b9b3d498ac0..2544b08761616dd9a847a18af20d4809acd1e157 100644 (file)
--- a/arch/arm/cpu/armv7/mx5/timer.c
+++ b/arch/arm/cpu/armv7/mx5/timer.c
@@ -52,6 +52,7 @@ DECLARE_GLOBAL_DATA_PTR;
 int timer_init(void)
 {
        int i;
+       ulong val;
 
        /* setup GP Timer 1 */
        __raw_writel(GPTCR_SWR, &cur_gpt->control);
@@ -65,15 +66,12 @@ int timer_init(void)
        /* Freerun Mode, PERCLK1 input */
        i = __raw_readl(&cur_gpt->control);
        __raw_writel(i | GPTCR_CLKSOURCE_32 | GPTCR_TEN, &cur_gpt->control);
-       reset_timer_masked();
-       return 0;
-}
 
-void reset_timer_masked(void)
-{
-       ulong val = __raw_readl(&cur_gpt->counter);
+       val = __raw_readl(&cur_gpt->counter);
        lastinc = val / (CONFIG_SYS_MX5_CLK32 / CONFIG_SYS_HZ);
        timestamp = 0;
+
+       return 0;
 }
 
 ulong get_timer_masked(void)

diff --git a/arch/arm/cpu/armv7/omap-common/timer.c b/arch/arm/cpu/armv7/omap-common/timer.c
index 4756e26516dae3a338dcac0f5ce3fd890cd1291d..9f8bc934470bf2129459e1d6934997f98ca93218 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/timer.c
+++ b/arch/arm/cpu/armv7/omap-common/timer.c
@@ -55,7 +55,9 @@ int timer_init(void)
        writel((CONFIG_SYS_PTV << 2) | TCLR_PRE | TCLR_AR | TCLR_ST,
                &timer_base->tclr);
 
-       reset_timer_masked();   /* init the timestamp and lastinc value */
+       /* reset time, capture current incrementer value time */
+       gd->lastinc = readl(&timer_base->tcrr) / (TIMER_CLOCK / CONFIG_SYS_HZ);
+       gd->tbl = 0;            /* start "advancing" time stamp from 0 */
 
        return 0;
 }
@@ -84,13 +86,6 @@ void __udelay(unsigned long usec)
        }
 }
 
-void reset_timer_masked(void)
-{
-       /* reset time, capture current incrementer value time */
-       gd->lastinc = readl(&timer_base->tcrr) / (TIMER_CLOCK / CONFIG_SYS_HZ);
-       gd->tbl = 0;            /* start "advancing" time stamp from 0 */
-}
-
 ulong get_timer_masked(void)
 {
        /* current tick value */

diff --git a/arch/arm/cpu/armv7/tegra2/timer.c b/arch/arm/cpu/armv7/tegra2/timer.c
index 2761c12be0de29370c19630dbc335d08b350506b..0b9fa6418ce0951cb365517358d6473bd056677d 100644 (file)
--- a/arch/arm/cpu/armv7/tegra2/timer.c
+++ b/arch/arm/cpu/armv7/tegra2/timer.c
@@ -69,13 +69,6 @@ void __udelay(unsigned long usec)
        }
 }
 
-void reset_timer_masked(void)
-{
-       /* reset time, capture current incrementer value time */
-       gd->lastinc = readl(&timer_base->cntr_1us) / (TIMER_CLK/CONFIG_SYS_HZ);
-       gd->tbl = 0;            /* start "advancing" time stamp from 0 */
-}
-
 ulong get_timer_masked(void)
 {
        ulong now;

diff --git a/arch/arm/cpu/pxa/timer.c b/arch/arm/cpu/pxa/timer.c
index 44dae9a98f2bb6b43bbe63d3d21e20d95bf7ff7a..2866745472235923578acf57e3373c45b0b5255f 100644 (file)
--- a/arch/arm/cpu/pxa/timer.c
+++ b/arch/arm/cpu/pxa/timer.c
@@ -59,7 +59,7 @@ static inline unsigned long long us_to_tick(unsigned long long us)
 
 int timer_init (void)
 {
-       reset_timer_masked();
+       writel(0, OSCR);
 
        return 0;
 }
@@ -74,12 +74,6 @@ void __udelay (unsigned long usec)
        udelay_masked (usec);
 }
 
-
-void reset_timer_masked (void)
-{
-       writel(0, OSCR);
-}
-
 ulong get_timer_masked (void)
 {
        return tick_to_time(get_ticks());

diff --git a/arch/arm/cpu/s3c44b0/timer.c b/arch/arm/cpu/s3c44b0/timer.c
index ce48952c9a93e259b46affa63262f07f9c731ce2..6c2f06681de05917c6fb0323147403b075061800 100644 (file)
--- a/arch/arm/cpu/s3c44b0/timer.c
+++ b/arch/arm/cpu/s3c44b0/timer.c
@@ -78,13 +78,6 @@ void __udelay (unsigned long usec)
                /*NOP*/;
 }
 
-void reset_timer_masked (void)
-{
-       /* reset time */
-       lastdec = READ_TIMER;
-       timestamp = 0;
-}
-
 ulong get_timer_masked (void)
 {
        ulong now = READ_TIMER;

diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c
index 694c03ab17848acd6b053cddb089bfb0117be34b..53bec0b760d53d219120990217c2be2ee94a49e6 100644 (file)
--- a/arch/arm/cpu/sa1100/timer.c
+++ b/arch/arm/cpu/sa1100/timer.c
@@ -44,12 +44,6 @@ void __udelay (unsigned long usec)
        udelay_masked (usec);
 }
 
-
-void reset_timer_masked (void)
-{
-       OSCR = 0;
-}
-
 ulong get_timer_masked (void)
 {
        return OSCR;

diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c
index 6734e8db3f6a684feb44df15428fe100b39c4408..f10a026636222a549026eea488482580577bfcfe 100644 (file)
--- a/board/armltd/integrator/timer.c
+++ b/board/armltd/integrator/timer.c
@@ -95,7 +95,10 @@ int timer_init (void)
 
        /* init the timestamp */
        total_count = 0ULL;
-       reset_timer_masked();
+       /* capure current decrementer value    */
+       lastdec   = READ_TIMER;
+       /* start "advancing" time stamp from 0 */
+       timestamp = 0L;
 
        div_timer = CONFIG_SYS_HZ_CLOCK;
        do_div(div_timer, CONFIG_SYS_HZ);
@@ -129,14 +132,6 @@ void __udelay (unsigned long usec)
        }
 }
 
-void reset_timer_masked (void)
-{
-       /* capure current decrementer value    */
-       lastdec   = READ_TIMER;
-       /* start "advancing" time stamp from 0 */
-       timestamp = 0L;
-}
-
 /* converts the timer reading to U-Boot ticks         */
 /* the timestamp is the number of ticks since reset    */
 ulong get_timer_masked (void)