Timer: Remove reset_timer() for non-Nios2 arches

diff --git a/arch/arm/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c
index d51acbbfecb93764c5fca39e9536cde24f1cd5cb..eac4ffb648819367e92920ab2729ae8800041cb7 100644 (file)
--- a/arch/arm/cpu/arm1136/mx31/timer.c
+++ b/arch/arm/cpu/arm1136/mx31/timer.c
@@ -113,11 +113,6 @@ void reset_timer_masked (void)
        gd->tbl = 0; /* start "advancing" time stamp from 0 */
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 unsigned long long get_ticks (void)
 {
        ulong now = GPTCNT; /* current tick value */

diff --git a/arch/arm/cpu/arm1136/mx35/timer.c b/arch/arm/cpu/arm1136/mx35/timer.c
index 6dfb63ac532b8eaec86ecc2917968731e1ff9da9..80c0675cfa807bb9e5514335f37902d5bb92f837 100644 (file)
--- a/arch/arm/cpu/arm1136/mx35/timer.c
+++ b/arch/arm/cpu/arm1136/mx35/timer.c
@@ -73,11 +73,6 @@ inline ulong get_timer_masked(void)
        return val;
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer(ulong base)
 {
        ulong tmp;

diff --git a/arch/arm/cpu/arm1136/omap24xx/timer.c b/arch/arm/cpu/arm1136/omap24xx/timer.c
index d6267ba72ea52b78da4cb928975ae40af814f386..6f1ebbf10f7e5639f3ae6ca3bbfde6c6ef21b26f 100644 (file)
--- a/arch/arm/cpu/arm1136/omap24xx/timer.c
+++ b/arch/arm/cpu/arm1136/omap24xx/timer.c
@@ -57,11 +57,6 @@ int timer_init (void)
 /*
  * timer without interrupts
  */
-void reset_timer (void)
-{
-       reset_timer_masked ();
-}
-
 ulong get_timer (ulong base)
 {
        return get_timer_masked () - base;

diff --git a/arch/arm/cpu/arm1176/s3c64xx/timer.c b/arch/arm/cpu/arm1176/s3c64xx/timer.c
index 8e540604c71d911e62080303e0394fbf2566b62f..bc21f86bc36c7a5b84ff9ef634a5d63c24f1450f 100644 (file)
--- a/arch/arm/cpu/arm1176/s3c64xx/timer.c
+++ b/arch/arm/cpu/arm1176/s3c64xx/timer.c
@@ -142,11 +142,6 @@ void reset_timer_masked(void)
        timestamp = 0;
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer_masked(void)
 {
        unsigned long long res = get_ticks();

diff --git a/arch/arm/cpu/arm1176/tnetv107x/timer.c b/arch/arm/cpu/arm1176/tnetv107x/timer.c
index c27375c44d2eb888538155063bf79e8ad1c5b2ee..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);

diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c
index 164ca5d7a0a03bd8a381405338aeb7ce09a7dd14..9cd7fee7375efae7caec1acec1f53eb5d59122d4 100644 (file)
--- a/arch/arm/cpu/arm720t/interrupts.c
+++ b/arch/arm/cpu/arm720t/interrupts.c
@@ -209,11 +209,6 @@ int timer_init (void)
 
 #if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_NETARM) || defined(CONFIG_ARMADILLO) || defined(CONFIG_LPC2292)
 
-void reset_timer (void)
-{
-       reset_timer_masked ();
-}
-
 ulong get_timer (ulong base)
 {
        return get_timer_masked () - base;

diff --git a/arch/arm/cpu/arm920t/a320/timer.c b/arch/arm/cpu/arm920t/a320/timer.c
index b9c83c02ea9dd28a9c520b61af6f68bc55a93f28..443d31d221e95e11762fb250430ecf3ea6afbc68 100644 (file)
--- a/arch/arm/cpu/arm920t/a320/timer.c
+++ b/arch/arm/cpu/arm920t/a320/timer.c
@@ -81,12 +81,6 @@ void reset_timer_masked(void)
        debug("%s(): lastdec = %lx\n", __func__, lastdec);
 }
 
-void reset_timer(void)
-{
-       debug("%s()\n", __func__);
-       reset_timer_masked();
-}
-
 /*
  * return timer ticks
  */

diff --git a/arch/arm/cpu/arm920t/at91/timer.c b/arch/arm/cpu/arm920t/at91/timer.c
index a69de5798c968ce7beaa7b216fbbab69bd77cf1f..374cc2553d850a56bdf0db81ac89666207002943 100644 (file)
--- a/arch/arm/cpu/arm920t/at91/timer.c
+++ b/arch/arm/cpu/arm920t/at91/timer.c
@@ -72,12 +72,6 @@ int timer_init(void)
 /*
  * timer without interrupts
  */
-
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer(ulong base)
 {
        return get_timer_masked() - base;

diff --git a/arch/arm/cpu/arm920t/at91rm9200/timer.c b/arch/arm/cpu/arm920t/at91rm9200/timer.c
index 0bcb775b0cce45c3e1e6077e9bbc6f339060a012..9a1ae8569e15c1d92a3f75f0bc9b43e66d6129ea 100644 (file)
--- a/arch/arm/cpu/arm920t/at91rm9200/timer.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/timer.c
@@ -71,12 +71,6 @@ int timer_init (void)
 /*
  * timer without interrupts
  */
-
-void reset_timer (void)
-{
-       reset_timer_masked ();
-}
-
 ulong get_timer (ulong base)
 {
        return get_timer_masked () - base;

diff --git a/arch/arm/cpu/arm920t/ep93xx/timer.c b/arch/arm/cpu/arm920t/ep93xx/timer.c
index 4a0ce4da642081900ee94dcf731ae3b6e3dac089..f19ec611d11120554c6dbbeff3c794cf2a23b008 100644 (file)
--- a/arch/arm/cpu/arm920t/ep93xx/timer.c
+++ b/arch/arm/cpu/arm920t/ep93xx/timer.c
@@ -97,11 +97,6 @@ void reset_timer_masked(void)
        timer.ticks = 0;
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 void __udelay(unsigned long usec)
 {
        unsigned long long target;

diff --git a/arch/arm/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c
index ff85a41a11306b0ae1052ab2cba384cf83a2a0ff..cdb214825ee7953b12dd0e46851b71388c04e8c6 100644 (file)
--- a/arch/arm/cpu/arm920t/imx/timer.c
+++ b/arch/arm/cpu/arm920t/imx/timer.c
@@ -51,12 +51,6 @@ int timer_init (void)
 /*
  * timer without interrupts
  */
-
-void reset_timer (void)
-{
-       reset_timer_masked ();
-}
-
 ulong get_timer (ulong base)
 {
        return get_timer_masked() - base;

diff --git a/arch/arm/cpu/arm920t/ks8695/timer.c b/arch/arm/cpu/arm920t/ks8695/timer.c
index 8e141090e6cb1472d1e24fdd64a5afbebb547631..c78fd90f4fb9d3620a9c6ddc411a4653451347c8 100644 (file)
--- a/arch/arm/cpu/arm920t/ks8695/timer.c
+++ b/arch/arm/cpu/arm920t/ks8695/timer.c
@@ -33,7 +33,7 @@ ulong timer_ticks;
 
 int timer_init (void)
 {
-       reset_timer();
+       reset_timer_masked();
 
        return 0;
 }
@@ -55,11 +55,6 @@ void reset_timer_masked(void)
        timer_ticks = 0;
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 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 bba06d5f946a6d31094f5c9c175de1551e82d2c9..9c71b807af97611628461bd02c27f4280b2a718c 100644 (file)
--- a/arch/arm/cpu/arm920t/s3c24x0/timer.c
+++ b/arch/arm/cpu/arm920t/s3c24x0/timer.c
@@ -83,12 +83,6 @@ int timer_init(void)
 /*
  * timer without interrupts
  */
-
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer(ulong base)
 {
        return get_timer_masked() - base;

diff --git a/arch/arm/cpu/arm925t/timer.c b/arch/arm/cpu/arm925t/timer.c
index fdaeda5a78b0f67ded7f8913953fb5e5bb3e762c..9c965e04f93f2435785c3e0adebf2a98032ee030 100644 (file)
--- a/arch/arm/cpu/arm925t/timer.c
+++ b/arch/arm/cpu/arm925t/timer.c
@@ -64,12 +64,6 @@ int timer_init (void)
 /*
  * timer without interrupts
  */
-
-void reset_timer (void)
-{
-       reset_timer_masked ();
-}
-
 ulong get_timer (ulong base)
 {
        return get_timer_masked () - base;

diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c
index eb4923463d47e1859c18065c73474f0aea9fb214..86da0ce5b0c9bd0657a3d8624ea6f334f3d4e8f2 100644 (file)
--- a/arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
@@ -100,11 +100,6 @@ 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)) -

diff --git a/arch/arm/cpu/arm926ejs/davinci/timer.c b/arch/arm/cpu/arm926ejs/davinci/timer.c
index 1c6fa4ae8715ef20f428853e739a1a7234ed3744..8b1734c8e106ec854a4f6eb3e2cc5125f205da52 100644 (file)
--- a/arch/arm/cpu/arm926ejs/davinci/timer.c
+++ b/arch/arm/cpu/arm926ejs/davinci/timer.c
@@ -78,11 +78,6 @@ int timer_init(void)
        return(0);
 }
 
-void reset_timer(void)
-{
-       gd->timer_reset_value = get_ticks();
-}
-
 /*
  * Get the current 64 bit timer tick count
  */

diff --git a/arch/arm/cpu/arm926ejs/kirkwood/timer.c b/arch/arm/cpu/arm926ejs/kirkwood/timer.c
index e890edbc850930d9faa53486107edd9e8a3b181b..5beb3f530ead6f159d5b1c9a174f8b0dedfd002c 100644 (file)
--- a/arch/arm/cpu/arm926ejs/kirkwood/timer.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/timer.c
@@ -112,11 +112,6 @@ ulong get_timer_masked(void)
        return timestamp;
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer(ulong base)
 {
        return get_timer_masked() - base;

diff --git a/arch/arm/cpu/arm926ejs/mb86r0x/timer.c b/arch/arm/cpu/arm926ejs/mb86r0x/timer.c
index 6966b0d190d641c6255c7dde30aa0b2a6384c1e9..5f540858c56c26ed0aa9e2cf4a643525fc330145 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mb86r0x/timer.c
+++ b/arch/arm/cpu/arm926ejs/mb86r0x/timer.c
@@ -121,11 +121,6 @@ void __udelay(unsigned long usec)
                 /*NOP*/;
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer(ulong base)
 {
        return get_timer_masked() - base;

diff --git a/arch/arm/cpu/arm926ejs/mx25/timer.c b/arch/arm/cpu/arm926ejs/mx25/timer.c
index 16159ea46e66c8f6e10a6ff114a619ba262fa5c5..0e479ac17fed049299013146671deaeaba4c49c8 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mx25/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx25/timer.c
@@ -130,11 +130,6 @@ void reset_timer_masked(void)
        timestamp = 0; /* start "advancing" time stamp from 0 */
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 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 127e670c8397649d072e1be4a53852b313559e3d..058dbee29c8b2a57b169bb1e924be6695a363445 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mx27/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx27/timer.c
@@ -133,11 +133,6 @@ void reset_timer_masked(void)
        timestamp = 0; /* start "advancing" time stamp from 0 */
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 unsigned long long get_ticks (void)
 {
        struct gpt_regs *regs = (struct gpt_regs *)IMX_TIM1_BASE;

diff --git a/arch/arm/cpu/arm926ejs/nomadik/timer.c b/arch/arm/cpu/arm926ejs/nomadik/timer.c
index 1d98ef3eb3d0ac30121fc6f7ebdfd8a080001ded..1cd0e1f12a1a66af9c7ba2d302051e6bd29f1b59 100644 (file)
--- a/arch/arm/cpu/arm926ejs/nomadik/timer.c
+++ b/arch/arm/cpu/arm926ejs/nomadik/timer.c
@@ -40,16 +40,12 @@
 /* Configure a free-running, auto-wrap counter with no prescaler */
 int timer_init(void)
 {
+       ulong val;
+
        writel(MTU_CRn_ENA | MTU_CRn_PRESCALE_1 | MTU_CRn_32BITS,
               CONFIG_SYS_TIMERBASE + MTU_CR(0));
-       reset_timer();
-       return 0;
-}
 
-/* Restart counting from 0 */
-void reset_timer(void)
-{
-       ulong val;
+       /* Reset the timer */
        writel(0, CONFIG_SYS_TIMERBASE + MTU_LR(0));
        /*
         * The load-register isn't really immediate: it changes on clock
@@ -59,6 +55,8 @@ void reset_timer(void)
        val = READ_TIMER();
        while (READ_TIMER() == val)
                ;
+
+       return 0;
 }
 
 /* Return how many HZ passed since "base" */

diff --git a/arch/arm/cpu/arm926ejs/omap/timer.c b/arch/arm/cpu/arm926ejs/omap/timer.c
index f2e4debc0050d02457bb13b3edb86e4440a54963..390c9c8abb5fd40bb0503eb9060af717e1c3f6df 100644 (file)
--- a/arch/arm/cpu/arm926ejs/omap/timer.c
+++ b/arch/arm/cpu/arm926ejs/omap/timer.c
@@ -65,12 +65,6 @@ int timer_init (void)
 /*
  * timer without interrupts
  */
-
-void reset_timer (void)
-{
-       reset_timer_masked ();
-}
-
 ulong get_timer (ulong base)
 {
        return get_timer_masked () - base;

diff --git a/arch/arm/cpu/arm926ejs/orion5x/timer.c b/arch/arm/cpu/arm926ejs/orion5x/timer.c
index f691c99779e5ab7d54e9a4c8e43f8b11201c5289..5bc43c8c19b8e025cf9acde398690a8e1363a702 100644 (file)
--- a/arch/arm/cpu/arm926ejs/orion5x/timer.c
+++ b/arch/arm/cpu/arm926ejs/orion5x/timer.c
@@ -119,11 +119,6 @@ ulong get_timer_masked(void)
        return timestamp;
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer(ulong base)
 {
        return get_timer_masked() - base;

diff --git a/arch/arm/cpu/arm926ejs/pantheon/timer.c b/arch/arm/cpu/arm926ejs/pantheon/timer.c
index b487416eb7f5530f20b535eb523fd8710716bdda..2727adce3d1625bb5e226f121b47bd5d4062d49e 100644 (file)
--- a/arch/arm/cpu/arm926ejs/pantheon/timer.c
+++ b/arch/arm/cpu/arm926ejs/pantheon/timer.c
@@ -108,11 +108,6 @@ 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)) -

diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c
index 7305abdd253082f9bd4f2cd7c7368d5af0ddee7d..cbef34fab5c5645304115cbef31444b0efb659d4 100644 (file)
--- a/arch/arm/cpu/arm926ejs/spear/timer.c
+++ b/arch/arm/cpu/arm926ejs/spear/timer.c
@@ -76,12 +76,6 @@ int timer_init(void)
 /*
  * timer without interrupts
  */
-
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer(ulong base)
 {
        return (get_timer_masked() / GPT_RESOLUTION) - base;

diff --git a/arch/arm/cpu/arm926ejs/versatile/timer.c b/arch/arm/cpu/arm926ejs/versatile/timer.c
index 0e51a6383069ca03d903b4038f516479f4e4876b..f58e151662086694cd7f4192bcd9d2069fe18e80 100644 (file)
--- a/arch/arm/cpu/arm926ejs/versatile/timer.c
+++ b/arch/arm/cpu/arm926ejs/versatile/timer.c
@@ -94,12 +94,6 @@ int timer_init (void)
 /*
  * timer without interrupts
  */
-
-void reset_timer (void)
-{
-       reset_timer_masked ();
-}
-
 ulong get_timer (ulong base)
 {
        return get_timer_masked () - base;

diff --git a/arch/arm/cpu/armv7/mx5/timer.c b/arch/arm/cpu/armv7/mx5/timer.c
index 40ee0be1e8c71b6062f9f1789365b362651424f2..4525bebacc0594a0c9012f66dfbc2b9b3d498ac0 100644 (file)
--- a/arch/arm/cpu/armv7/mx5/timer.c
+++ b/arch/arm/cpu/armv7/mx5/timer.c
@@ -69,11 +69,6 @@ int timer_init(void)
        return 0;
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 void reset_timer_masked(void)
 {
        ulong val = __raw_readl(&cur_gpt->counter);

diff --git a/arch/arm/cpu/armv7/omap-common/timer.c b/arch/arm/cpu/armv7/omap-common/timer.c
index a0f6b7c144cacfaf80bb809a9738694646a49a4d..4756e26516dae3a338dcac0f5ce3fd890cd1291d 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/timer.c
+++ b/arch/arm/cpu/armv7/omap-common/timer.c
@@ -63,11 +63,6 @@ int timer_init(void)
 /*
  * timer without interrupts
  */
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer(ulong base)
 {
        return get_timer_masked() - base;

diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c
index 0b69f0678cf0c0be214b840527278832806a85ea..359c21f5e0c9e2ad02c48b3e61615c2cc3e2dcf9 100644 (file)
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -50,11 +50,6 @@ int timer_init(void)
 /*
  * timer without interrupts
  */
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 unsigned long get_timer(unsigned long base)
 {
        return get_timer_masked() - base;

diff --git a/arch/arm/cpu/armv7/tegra2/timer.c b/arch/arm/cpu/armv7/tegra2/timer.c
index 4458de9138c7ec370a93e3e1512ae881ad1dd5b6..2761c12be0de29370c19630dbc335d08b350506b 100644 (file)
--- a/arch/arm/cpu/armv7/tegra2/timer.c
+++ b/arch/arm/cpu/armv7/tegra2/timer.c
@@ -48,11 +48,6 @@ struct timerus *timer_base = (struct timerus *)NV_PA_TMRUS_BASE;
 #define TIMER_LOAD_VAL 0xffffffff
 
 /* timer without interrupts */
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer(ulong base)
 {
        return get_timer_masked() - base;

diff --git a/arch/arm/cpu/ixp/timer.c b/arch/arm/cpu/ixp/timer.c
index c25e72fa5533a65aae5fd54072359a20bfdf8a8c..087ddf80ef7c9f28ea62c3ca4d7a14530edffa22 100644 (file)
--- a/arch/arm/cpu/ixp/timer.c
+++ b/arch/arm/cpu/ixp/timer.c
@@ -89,11 +89,6 @@ void reset_timer_masked(void)
        gd->timestamp = 0;
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer_masked(void)
 {
        return tick_to_time(get_ticks());

diff --git a/arch/arm/cpu/lh7a40x/timer.c b/arch/arm/cpu/lh7a40x/timer.c
index 6c6277dcaa287174698947b7b5a73a215c5366f1..58b35b15e6f17b1f0cddd4740ff4c2b202709b48 100644 (file)
--- a/arch/arm/cpu/lh7a40x/timer.c
+++ b/arch/arm/cpu/lh7a40x/timer.c
@@ -74,12 +74,6 @@ int timer_init (void)
 /*
  * timer without interrupts
  */
-
-void reset_timer (void)
-{
-       reset_timer_masked ();
-}
-
 ulong get_timer (ulong base)
 {
        return (get_timer_masked() - base);

diff --git a/arch/arm/cpu/pxa/timer.c b/arch/arm/cpu/pxa/timer.c
index 8900a705dfcf347076a517f518c13f1fefd16eb5..44dae9a98f2bb6b43bbe63d3d21e20d95bf7ff7a 100644 (file)
--- a/arch/arm/cpu/pxa/timer.c
+++ b/arch/arm/cpu/pxa/timer.c
@@ -59,16 +59,11 @@ static inline unsigned long long us_to_tick(unsigned long long us)
 
 int timer_init (void)
 {
-       reset_timer();
+       reset_timer_masked();
 
        return 0;
 }
 
-void reset_timer (void)
-{
-       reset_timer_masked ();
-}
-
 ulong get_timer (ulong base)
 {
        return get_timer_masked () - base;

diff --git a/arch/arm/cpu/s3c44b0/timer.c b/arch/arm/cpu/s3c44b0/timer.c
index d30e1aab8c364b8446d37c48fa5aba505c8bd1d4..ce48952c9a93e259b46affa63262f07f9c731ce2 100644 (file)
--- a/arch/arm/cpu/s3c44b0/timer.c
+++ b/arch/arm/cpu/s3c44b0/timer.c
@@ -59,12 +59,6 @@ int timer_init (void)
 /*
  * timer without interrupts
  */
-
-void reset_timer (void)
-{
-       reset_timer_masked ();
-}
-
 ulong get_timer (ulong base)
 {
        return get_timer_masked () - base;

diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c
index 10ad964ed8201ba7ee629c592b17ff770e255436..694c03ab17848acd6b053cddb089bfb0117be34b 100644 (file)
--- a/arch/arm/cpu/sa1100/timer.c
+++ b/arch/arm/cpu/sa1100/timer.c
@@ -34,11 +34,6 @@ int timer_init (void)
        return 0;
 }
 
-void reset_timer (void)
-{
-       reset_timer_masked ();
-}
-
 ulong get_timer (ulong base)
 {
        return get_timer_masked ();

diff --git a/arch/avr32/cpu/interrupts.c b/arch/avr32/cpu/interrupts.c
index 8406f912246114e77c804d13f41fd4e0c5c6470d..6681e13b9393d604584f86542526d9d4a99b7639 100644 (file)
--- a/arch/avr32/cpu/interrupts.c
+++ b/arch/avr32/cpu/interrupts.c
@@ -62,13 +62,6 @@ unsigned long long get_ticks(void)
        return ((unsigned long long)hi_now << 32) | lo;
 }
 
-void reset_timer(void)
-{
-       sysreg_write(COUNT, 0);
-       cpu_sync_pipeline();    /* process any pending interrupts */
-       timer_overflow = 0;
-}
-
 unsigned long get_timer(unsigned long base)
 {
        u64 now = get_ticks();

diff --git a/arch/blackfin/cpu/interrupts.c b/arch/blackfin/cpu/interrupts.c
index 54a67b4971ae368768dfdd60d095e1ca97f8fa86..9189816699862706bd02e953da574248d57aba3c 100644 (file)
--- a/arch/blackfin/cpu/interrupts.c
+++ b/arch/blackfin/cpu/interrupts.c
@@ -152,8 +152,3 @@ ulong get_timer(ulong base)
 
        return (milisec - base);
 }
-
-void reset_timer(void)
-{
-       timer_init();
-}

diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
index 49dba6ac6ac0474ca1eb7b80496139442fbc6ab0..467a807802874336726e4b8e1b1b28b56922acd1 100644 (file)
--- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
+++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
@@ -95,11 +95,6 @@ void timer_init(void)
        timerp->cr = SLT_CR_RUN | SLT_CR_IEN | SLT_CR_TEN;
 }
 
-void reset_timer(void)
-{
-       timestamp = 0;
-}
-
 ulong get_timer(ulong base)
 {
        return (timestamp - base);

diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index d10bcc7c16679b7569bd14a83050eeaf62f14e73..a316cdfd4ed413f0646aacdb99b41aefcca4e07d 100644 (file)
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -116,11 +116,6 @@ void timer_init(void)
            DTIM_DTMR_FRR | DTIM_DTMR_ORRI | DTIM_DTMR_RST_EN;
 }
 
-void reset_timer(void)
-{
-       timestamp = 0;
-}
-
 ulong get_timer(ulong base)
 {
        return (timestamp - base);

diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 59ed126487fca4d2534d9cab9a39712a9e10b463..a167755bdd0527005030c4566c1ef2c50a7b1c1e 100644 (file)
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -28,11 +28,6 @@
 
 volatile int timestamp = 0;
 
-void reset_timer (void)
-{
-       timestamp = 0;
-}
-
 #ifdef CONFIG_SYS_TIMER_0
 ulong get_timer (ulong base)
 {
@@ -61,7 +56,7 @@ int timer_init (void)
        tmr->control = TIMER_INTERRUPT | TIMER_RESET;
        tmr->control =
            TIMER_ENABLE | TIMER_ENABLE_INTR | TIMER_RELOAD | TIMER_DOWN_COUNT;
-       reset_timer ();
+       timestamp = 0;
        install_interrupt_handler (CONFIG_SYS_TIMER_0_IRQ, timer_isr, (void *)tmr);
        return 0;
 }

diff --git a/arch/mips/cpu/mips32/time.c b/arch/mips/cpu/mips32/time.c
index b0a9c1f671e0dddec3aeeec3117117e8461f3feb..350896a2a5657e4cd08b2ab428fd6b1ce1e1ef1e 100644 (file)
--- a/arch/mips/cpu/mips32/time.c
+++ b/arch/mips/cpu/mips32/time.c
@@ -42,12 +42,6 @@ int timer_init(void)
        return 0;
 }
 
-void reset_timer(void)
-{
-       timestamp = 0;
-       write_c0_compare(read_c0_count() + CYCLES_PER_JIFFY);
-}
-
 ulong get_timer(ulong base)
 {
        unsigned int count;

diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index 847ad37a288ef43a4f08a100be93894f6ae27b23..aeae4136970e3c248c34bec9f818778b7255a6e4 100644 (file)
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -137,11 +137,6 @@ void timer_interrupt (struct pt_regs *regs)
 #endif /* CONFIG_SHOW_ACTIVITY */
 }
 
-void reset_timer (void)
-{
-       timestamp = 0;
-}
-
 ulong get_timer (ulong base)
 {
        return (timestamp - base);

diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c
index c4bfc8638c6ce385e9582c035f4abafe9338edd5..c70baedbf1cac8e87f70b0019ce51b35c7c58a7e 100644 (file)
--- a/arch/sh/lib/time.c
+++ b/arch/sh/lib/time.c
@@ -139,13 +139,6 @@ unsigned long get_timer (unsigned long base)
        return tick_to_time(get_ticks()) - base;
 }
 
-void reset_timer (void)
-{
-       tmu_timer_stop(0);
-       writel(0, TCNT0);
-       tmu_timer_start(0);
-}
-
 unsigned long get_tbclk (void)
 {
        return timer_freq;

diff --git a/arch/sh/lib/time_sh2.c b/arch/sh/lib/time_sh2.c
index a5c838bff0d8473f38dcd0528a46cf662898af98..58271186e2c862dcbe5de16e1c81a8c6065788ab 100644 (file)
--- a/arch/sh/lib/time_sh2.c
+++ b/arch/sh/lib/time_sh2.c
@@ -90,14 +90,6 @@ ulong get_timer(ulong base)
        return (get_usec() / 1000) - base;
 }
 
-void reset_timer(void)
-{
-       cmt_timer_stop(0);
-       writew(CMT_TIMER_RESET, CMCOR_0);
-       cmt0_timer = 0;
-       cmt_timer_start(0);
-}
-
 void __udelay(unsigned long usec)
 {
        unsigned long end = get_usec() + usec;

diff --git a/arch/sparc/lib/interrupts.c b/arch/sparc/lib/interrupts.c
index 5274311a64007bd9a188fabe03d1434b1b8ba455..61ee90b6d41fc7a9c72fe8f6f997eb0f2214d536 100644 (file)
--- a/arch/sparc/lib/interrupts.c
+++ b/arch/sparc/lib/interrupts.c
@@ -90,11 +90,6 @@ void timer_interrupt(struct pt_regs *regs)
        timestamp++;
 }
 
-void reset_timer(void)
-{
-       timestamp = 0;
-}
-
 ulong get_timer(ulong base)
 {
        return (timestamp - base);
@@ -104,7 +99,7 @@ void timer_interrupt_init(void)
 {
        int irq;
 
-       reset_timer();
+       timestamp = 0;
 
        irq = timer_interrupt_init_cpu();
 

diff --git a/arch/x86/lib/timer.c b/arch/x86/lib/timer.c
index 199ca8e5e7d516eb1eceba6aaa5653daeff22e0c..a822d66af5e942d12cc5451b9a99e4b27508d22d 100644 (file)
--- a/arch/x86/lib/timer.c
+++ b/arch/x86/lib/timer.c
@@ -94,11 +94,6 @@ void timer_isr(void *unused)
        }
 }
 
-void reset_timer (void)
-{
-       system_ticks = 0;
-}
-
 ulong get_timer (ulong base)
 {
        return (system_ticks - base);

diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c
index 5406066d151be8e320f31372240236065f11a530..6734e8db3f6a684feb44df15428fe100b39c4408 100644 (file)
--- a/board/armltd/integrator/timer.c
+++ b/board/armltd/integrator/timer.c
@@ -107,11 +107,6 @@ int timer_init (void)
 /*
  * timer without interrupts
  */
-void reset_timer (void)
-{
-       reset_timer_masked ();
-}
-
 ulong get_timer (ulong base_ticks)
 {
        return get_timer_masked () - base_ticks;

diff --git a/board/armltd/vexpress/ca9x4_ct_vxp.c b/board/armltd/vexpress/ca9x4_ct_vxp.c
index 6e5884b204eb3ae9ab129b79a1604a288272fa39..da6f14d9888302592df5956007410b1e545f74f6 100644 (file)
--- a/board/armltd/vexpress/ca9x4_ct_vxp.c
+++ b/board/armltd/vexpress/ca9x4_ct_vxp.c
@@ -199,11 +199,6 @@ void reset_timer_masked(void)
        timestamp = 0;
 }
 
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer_masked(void)
 {
        ulong now = readl(&systimer_base->timer0value) / 1000;

diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index 627e061798f60ccdbcf2e2cf10cafc3100651905..8ab94404d12cf2ffff1f767a5e38f7b04c1d03d4 100644 (file)
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -66,7 +66,6 @@ int board_early_init_f(void)
  */
 int timer_init(void)
 {
-       reset_timer();
        return 0;
 }