Timer: Remove set_timer completely

diff --git a/arch/arm/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c
index c4bc3b35210fe5d1c1c8d6cc504c936fb225b0d0..d51acbbfecb93764c5fca39e9536cde24f1cd5cb 100644 (file)
--- a/arch/arm/cpu/arm1136/mx31/timer.c
+++ b/arch/arm/cpu/arm1136/mx31/timer.c
@@ -147,11 +147,6 @@ ulong get_timer (ulong base)
        return get_timer_masked () - base;
 }
 
-void set_timer (ulong t)
-{
-       gd->tbl = time_to_tick(t);
-}
-
 /* delay x useconds AND preserve advance timestamp value */
 void __udelay (unsigned long usec)
 {

diff --git a/arch/arm/cpu/arm1136/mx35/timer.c b/arch/arm/cpu/arm1136/mx35/timer.c
index db1e2c9d418dedaa340f25d7dd4aae54e00f5f2f..6dfb63ac532b8eaec86ecc2917968731e1ff9da9 100644 (file)
--- a/arch/arm/cpu/arm1136/mx35/timer.c
+++ b/arch/arm/cpu/arm1136/mx35/timer.c
@@ -92,10 +92,6 @@ ulong get_timer(ulong base)
        return (tmp / 1000) - base;
 }
 
-void set_timer(ulong t)
-{
-}
-
 /*
  * delay x useconds AND preserve advance timstamp value
  * GPTCNT is now supposed to tick 1 by 1 us.

diff --git a/arch/arm/cpu/arm1136/omap24xx/timer.c b/arch/arm/cpu/arm1136/omap24xx/timer.c
index 228ceba82e04b201786354ac06517db05c9738b7..d6267ba72ea52b78da4cb928975ae40af814f386 100644 (file)
--- a/arch/arm/cpu/arm1136/omap24xx/timer.c
+++ b/arch/arm/cpu/arm1136/omap24xx/timer.c
@@ -67,11 +67,6 @@ ulong get_timer (ulong base)
        return get_timer_masked () - base;
 }
 
-void set_timer (ulong t)
-{
-       gd->tbl = t;
-}
-
 /* delay x useconds AND preserve advance timestamp value */
 void __udelay (unsigned long usec)
 {

diff --git a/arch/arm/cpu/arm1176/s3c64xx/timer.c b/arch/arm/cpu/arm1176/s3c64xx/timer.c
index 9768319efa07992375a03eafeec80bcbe30b4eec..8e540604c71d911e62080303e0394fbf2566b62f 100644 (file)
--- a/arch/arm/cpu/arm1176/s3c64xx/timer.c
+++ b/arch/arm/cpu/arm1176/s3c64xx/timer.c
@@ -159,11 +159,6 @@ ulong get_timer(ulong base)
        return get_timer_masked() - base;
 }
 
-void set_timer(ulong t)
-{
-       timestamp = t * (timer_load_val / (100 * CONFIG_SYS_HZ));
-}
-
 void __udelay(unsigned long usec)
 {
        unsigned long long tmp;

diff --git a/arch/arm/cpu/arm1176/tnetv107x/timer.c b/arch/arm/cpu/arm1176/tnetv107x/timer.c
index a7a400d1e12b56f1656f52362a10d416f3c70e9f..c27375c44d2eb888538155063bf79e8ad1c5b2ee 100644 (file)
--- a/arch/arm/cpu/arm1176/tnetv107x/timer.c
+++ b/arch/arm/cpu/arm1176/tnetv107x/timer.c
@@ -88,11 +88,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);

diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c
index eb8d4253181c12a6136ce9ac8bec21a069c49f38..164ca5d7a0a03bd8a381405338aeb7ce09a7dd14 100644 (file)
--- a/arch/arm/cpu/arm720t/interrupts.c
+++ b/arch/arm/cpu/arm720t/interrupts.c
@@ -219,11 +219,6 @@ ulong get_timer (ulong base)
        return get_timer_masked () - base;
 }
 
-void set_timer (ulong t)
-{
-       timestamp = t;
-}
-
 void __udelay (unsigned long usec)
 {
        ulong tmo;

diff --git a/arch/arm/cpu/arm920t/a320/timer.c b/arch/arm/cpu/arm920t/a320/timer.c
index 95cb8fd19fe19eabb419197818ebdf3bc3abcca3..b9c83c02ea9dd28a9c520b61af6f68bc55a93f28 100644 (file)
--- a/arch/arm/cpu/arm920t/a320/timer.c
+++ b/arch/arm/cpu/arm920t/a320/timer.c
@@ -132,12 +132,6 @@ ulong get_timer(ulong base)
        return get_timer_masked() - base;
 }
 
-void set_timer(ulong t)
-{
-       debug("%s(%lx)\n", __func__, t);
-       timestamp = t;
-}
-
 /* delay x useconds AND preserve advance timestamp value */
 void __udelay(unsigned long usec)
 {

diff --git a/arch/arm/cpu/arm920t/at91/timer.c b/arch/arm/cpu/arm920t/at91/timer.c
index f0ad7d637e2fbe7ebc5be3c931250ea8c25fd942..a69de5798c968ce7beaa7b216fbbab69bd77cf1f 100644 (file)
--- a/arch/arm/cpu/arm920t/at91/timer.c
+++ b/arch/arm/cpu/arm920t/at91/timer.c
@@ -83,11 +83,6 @@ ulong get_timer(ulong base)
        return get_timer_masked() - base;
 }
 
-void set_timer(ulong t)
-{
-       gd->tbl = t;
-}
-
 void __udelay(unsigned long usec)
 {
        udelay_masked(usec);

diff --git a/arch/arm/cpu/arm920t/at91rm9200/timer.c b/arch/arm/cpu/arm920t/at91rm9200/timer.c
index 9c54bbedbe646d8cd79e3a0ad7596d12f727afe2..0bcb775b0cce45c3e1e6077e9bbc6f339060a012 100644 (file)
--- a/arch/arm/cpu/arm920t/at91rm9200/timer.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/timer.c
@@ -82,11 +82,6 @@ ulong get_timer (ulong base)
        return get_timer_masked () - base;
 }
 
-void set_timer (ulong t)
-{
-       timestamp = t;
-}
-
 void __udelay (unsigned long usec)
 {
        udelay_masked(usec);

diff --git a/arch/arm/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c
index b06b518f03b2801de67622f54d34a8d2ac2b12cf..ff85a41a11306b0ae1052ab2cba384cf83a2a0ff 100644 (file)
--- a/arch/arm/cpu/arm920t/imx/timer.c
+++ b/arch/arm/cpu/arm920t/imx/timer.c
@@ -62,11 +62,6 @@ ulong get_timer (ulong base)
        return get_timer_masked() - base;
 }
 
-void set_timer (ulong t)
-{
-       /* nop */
-}
-
 void reset_timer_masked (void)
 {
        TCTL1 &= ~TCTL_TEN;

diff --git a/arch/arm/cpu/arm920t/ks8695/timer.c b/arch/arm/cpu/arm920t/ks8695/timer.c
index 886e370596287310dc411a5d1d47bf62412c320b..8e141090e6cb1472d1e24fdd64a5afbebb547631 100644 (file)
--- a/arch/arm/cpu/arm920t/ks8695/timer.c
+++ b/arch/arm/cpu/arm920t/ks8695/timer.c
@@ -76,11 +76,6 @@ ulong get_timer(ulong base)
        return (get_timer_masked() - base);
 }
 
-void set_timer(ulong t)
-{
-       timer_ticks = t;
-}
-
 void __udelay(ulong usec)
 {
        ulong start = get_timer_masked();

diff --git a/arch/arm/cpu/arm920t/s3c24x0/timer.c b/arch/arm/cpu/arm920t/s3c24x0/timer.c
index f17b7ea5af122c72de4cb2e524b4d955b58f4a99..bba06d5f946a6d31094f5c9c175de1551e82d2c9 100644 (file)
--- a/arch/arm/cpu/arm920t/s3c24x0/timer.c
+++ b/arch/arm/cpu/arm920t/s3c24x0/timer.c
@@ -94,11 +94,6 @@ ulong get_timer(ulong base)
        return get_timer_masked() - base;
 }
 
-void set_timer(ulong t)
-{
-       timestamp = t;
-}
-
 void __udelay (unsigned long usec)
 {
        ulong tmo;

diff --git a/arch/arm/cpu/arm925t/timer.c b/arch/arm/cpu/arm925t/timer.c
index 7dfe2b56463b6c03f7c5551b2fc569631aa0dd12..fdaeda5a78b0f67ded7f8913953fb5e5bb3e762c 100644 (file)
--- a/arch/arm/cpu/arm925t/timer.c
+++ b/arch/arm/cpu/arm925t/timer.c
@@ -75,11 +75,6 @@ ulong get_timer (ulong base)
        return get_timer_masked () - base;
 }
 
-void set_timer (ulong t)
-{
-       timestamp = t;
-}
-
 /* delay x useconds AND preserve advance timestamp value */
 void __udelay (unsigned long usec)
 {

diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c
index 5d911c517ec162c0981666743a5f05eda9ff1dd7..eb4923463d47e1859c18065c73474f0aea9fb214 100644 (file)
--- a/arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
@@ -111,11 +111,6 @@ ulong get_timer(ulong base)
                base);
 }
 
-void set_timer(ulong t)
-{
-       gd->tbu = t;
-}
-
 void __udelay(unsigned long usec)
 {
        ulong delayticks;

diff --git a/arch/arm/cpu/arm926ejs/kirkwood/timer.c b/arch/arm/cpu/arm926ejs/kirkwood/timer.c
index 3e8032960842e7c935daa34d189b9b441b9fe99a..e890edbc850930d9faa53486107edd9e8a3b181b 100644 (file)
--- a/arch/arm/cpu/arm926ejs/kirkwood/timer.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/timer.c
@@ -122,11 +122,6 @@ ulong get_timer(ulong base)
        return get_timer_masked() - base;
 }
 
-void set_timer(ulong t)
-{
-       timestamp = t;
-}
-
 void __udelay(unsigned long usec)
 {
        uint current;

diff --git a/arch/arm/cpu/arm926ejs/mx25/timer.c b/arch/arm/cpu/arm926ejs/mx25/timer.c
index 7c8a71b9d3aece9f48ad341c90ef032b4c360875..16159ea46e66c8f6e10a6ff114a619ba262fa5c5 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mx25/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx25/timer.c
@@ -170,11 +170,6 @@ ulong get_timer (ulong base)
        return get_timer_masked () - base;
 }
 
-void set_timer (ulong t)
-{
-       timestamp = time_to_tick(t);
-}
-
 /* delay x useconds AND preserve advance timstamp value */
 void __udelay (unsigned long usec)
 {

diff --git a/arch/arm/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c
index 5c1cf014f05a46565515db626e7e425a84f66126..127e670c8397649d072e1be4a53852b313559e3d 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mx27/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx27/timer.c
@@ -173,11 +173,6 @@ ulong get_timer (ulong base)
        return get_timer_masked () - base;
 }
 
-void set_timer (ulong t)
-{
-       timestamp = time_to_tick(t);
-}
-
 /* delay x useconds AND preserve advance timstamp value */
 void __udelay (unsigned long usec)
 {

diff --git a/arch/arm/cpu/arm926ejs/omap/timer.c b/arch/arm/cpu/arm926ejs/omap/timer.c
index 88a0ee677eacec1776f29955092a839e7693ac7a..f2e4debc0050d02457bb13b3edb86e4440a54963 100644 (file)
--- a/arch/arm/cpu/arm926ejs/omap/timer.c
+++ b/arch/arm/cpu/arm926ejs/omap/timer.c
@@ -76,11 +76,6 @@ ulong get_timer (ulong base)
        return get_timer_masked () - base;
 }
 
-void set_timer (ulong t)
-{
-       timestamp = t;
-}
-
 /* delay x useconds AND preserve advance timestamp value */
 void __udelay (unsigned long usec)
 {

diff --git a/arch/arm/cpu/arm926ejs/orion5x/timer.c b/arch/arm/cpu/arm926ejs/orion5x/timer.c
index 9d452606122838efcbdd730e323cae4355ad4279..f691c99779e5ab7d54e9a4c8e43f8b11201c5289 100644 (file)
--- a/arch/arm/cpu/arm926ejs/orion5x/timer.c
+++ b/arch/arm/cpu/arm926ejs/orion5x/timer.c
@@ -129,11 +129,6 @@ ulong get_timer(ulong base)
        return get_timer_masked() - base;
 }
 
-void set_timer(ulong t)
-{
-       timestamp = t;
-}
-
 static inline ulong uboot_cntr_val(void)
 {
        return readl(CNTMR_VAL_REG(UBOOT_CNTR));

diff --git a/arch/arm/cpu/arm926ejs/pantheon/timer.c b/arch/arm/cpu/arm926ejs/pantheon/timer.c
index ca7f7f07136a476cf4a8f0909abb6a9a57163a01..b487416eb7f5530f20b535eb523fd8710716bdda 100644 (file)
--- a/arch/arm/cpu/arm926ejs/pantheon/timer.c
+++ b/arch/arm/cpu/arm926ejs/pantheon/timer.c
@@ -119,11 +119,6 @@ ulong get_timer(ulong base)
                base);
 }
 
-void set_timer(ulong t)
-{
-       gd->tbu = t;
-}
-
 void __udelay(unsigned long usec)
 {
        ulong delayticks;

diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c
index 66cf4de81713205d24e1b3d94f862f01badf62a4..7305abdd253082f9bd4f2cd7c7368d5af0ddee7d 100644 (file)
--- a/arch/arm/cpu/arm926ejs/spear/timer.c
+++ b/arch/arm/cpu/arm926ejs/spear/timer.c
@@ -87,11 +87,6 @@ ulong get_timer(ulong base)
        return (get_timer_masked() / GPT_RESOLUTION) - base;
 }
 
-void set_timer(ulong t)
-{
-       timestamp = t;
-}
-
 void __udelay(unsigned long usec)
 {
        ulong tmo;

diff --git a/arch/arm/cpu/arm926ejs/versatile/timer.c b/arch/arm/cpu/arm926ejs/versatile/timer.c
index 2e243b196eb7c46e90d198b9a51431d092dc6ce6..0e51a6383069ca03d903b4038f516479f4e4876b 100644 (file)
--- a/arch/arm/cpu/arm926ejs/versatile/timer.c
+++ b/arch/arm/cpu/arm926ejs/versatile/timer.c
@@ -105,11 +105,6 @@ ulong get_timer (ulong base)
        return get_timer_masked () - base;
 }
 
-void set_timer (ulong t)
-{
-       timestamp = t;
-}
-
 /* delay x useconds AND preserve advance timestamp value */
 void __udelay (unsigned long usec)
 {

diff --git a/arch/arm/cpu/armv7/mx5/timer.c b/arch/arm/cpu/armv7/mx5/timer.c
index 1972f6437dc89edd3c2758df4930b0ed61b738f2..40ee0be1e8c71b6062f9f1789365b362651424f2 100644 (file)
--- a/arch/arm/cpu/armv7/mx5/timer.c
+++ b/arch/arm/cpu/armv7/mx5/timer.c
@@ -99,11 +99,6 @@ ulong get_timer(ulong base)
        return get_timer_masked() - base;
 }
 
-void set_timer(ulong t)
-{
-       timestamp = t;
-}
-
 /* delay x useconds AND preserve advance timestamp value */
 void __udelay(unsigned long usec)
 {

diff --git a/arch/arm/cpu/armv7/omap-common/timer.c b/arch/arm/cpu/armv7/omap-common/timer.c
index 59bbca84a682579319e5d3245411e94c75586ca9..a0f6b7c144cacfaf80bb809a9738694646a49a4d 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/timer.c
+++ b/arch/arm/cpu/armv7/omap-common/timer.c
@@ -73,11 +73,6 @@ ulong get_timer(ulong base)
        return get_timer_masked() - base;
 }
 
-void set_timer(ulong t)
-{
-       gd->tbl = t;
-}
-
 /* delay x useconds */
 void __udelay(unsigned long usec)
 {

diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c
index b750d161417bb891a641aee19afceb4dec078e2a..0b69f0678cf0c0be214b840527278832806a85ea 100644 (file)
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -60,11 +60,6 @@ unsigned long get_timer(unsigned long base)
        return get_timer_masked() - base;
 }
 
-void set_timer(unsigned long t)
-{
-       gd->tbl = t;
-}
-
 /* delay x useconds */
 void __udelay(unsigned long usec)
 {

diff --git a/arch/arm/cpu/armv7/tegra2/timer.c b/arch/arm/cpu/armv7/tegra2/timer.c
index fb061d091c08224d5fb683076d851525afe40f16..4458de9138c7ec370a93e3e1512ae881ad1dd5b6 100644 (file)
--- a/arch/arm/cpu/armv7/tegra2/timer.c
+++ b/arch/arm/cpu/armv7/tegra2/timer.c
@@ -58,11 +58,6 @@ ulong get_timer(ulong base)
        return get_timer_masked() - base;
 }
 
-void set_timer(ulong t)
-{
-       gd->tbl = t;
-}
-
 /* delay x useconds */
 void __udelay(unsigned long usec)
 {

diff --git a/arch/arm/cpu/armv7/u8500/timer.c b/arch/arm/cpu/armv7/u8500/timer.c
index 8e96eaa771b74176a45e36340397580635563472..79aad9983a5982ab0d7cc406a21bcf1afe174c6a 100644 (file)
--- a/arch/arm/cpu/armv7/u8500/timer.c
+++ b/arch/arm/cpu/armv7/u8500/timer.c
@@ -129,11 +129,6 @@ ulong get_timer(ulong base)
        return get_timer_masked() - base;
 }
 
-void set_timer(ulong t)
-{
-       gd->tbl = t;
-}
-
 /*
  * Emulation of Power architecture long long timebase.
  *

diff --git a/arch/arm/cpu/ixp/timer.c b/arch/arm/cpu/ixp/timer.c
index 9f3ea42ece3705665dd6efb75f5b47ab46b58242..c25e72fa5533a65aae5fd54072359a20bfdf8a8c 100644 (file)
--- a/arch/arm/cpu/ixp/timer.c
+++ b/arch/arm/cpu/ixp/timer.c
@@ -104,11 +104,6 @@ ulong get_timer(ulong base)
        return get_timer_masked() - base;
 }
 
-void set_timer(ulong t)
-{
-       gd->timestamp = time_to_tick(t);
-}
-
 /* delay x useconds AND preserve advance timestamp value */
 void __udelay(unsigned long usec)
 {

diff --git a/arch/arm/cpu/lh7a40x/timer.c b/arch/arm/cpu/lh7a40x/timer.c
index 2691315d84f71c84dbed5a895b6b76770ff19e2e..6c6277dcaa287174698947b7b5a73a215c5366f1 100644 (file)
--- a/arch/arm/cpu/lh7a40x/timer.c
+++ b/arch/arm/cpu/lh7a40x/timer.c
@@ -85,11 +85,6 @@ ulong get_timer (ulong base)
        return (get_timer_masked() - base);
 }
 
-void set_timer (ulong t)
-{
-       timestamp = t;
-}
-
 void __udelay (unsigned long usec)
 {
        ulong tmo,tmp;

diff --git a/arch/arm/cpu/pxa/timer.c b/arch/arm/cpu/pxa/timer.c
index ec950c79660ebb1e0c9816a6d0e24a3c9ca3293b..8900a705dfcf347076a517f518c13f1fefd16eb5 100644 (file)
--- a/arch/arm/cpu/pxa/timer.c
+++ b/arch/arm/cpu/pxa/timer.c
@@ -74,11 +74,6 @@ ulong get_timer (ulong base)
        return get_timer_masked () - base;
 }
 
-void set_timer (ulong t)
-{
-       /* nop */
-}
-
 void __udelay (unsigned long usec)
 {
        udelay_masked (usec);

diff --git a/arch/arm/cpu/s3c44b0/timer.c b/arch/arm/cpu/s3c44b0/timer.c
index 6f1d8f677afbdf849860ba1ee7bed935421ba10b..d30e1aab8c364b8446d37c48fa5aba505c8bd1d4 100644 (file)
--- a/arch/arm/cpu/s3c44b0/timer.c
+++ b/arch/arm/cpu/s3c44b0/timer.c
@@ -70,11 +70,6 @@ ulong get_timer (ulong base)
        return get_timer_masked () - base;
 }
 
-void set_timer (ulong t)
-{
-       timestamp = t;
-}
-
 void __udelay (unsigned long usec)
 {
        ulong tmo;

diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c
index 020750125af3929c6d94547a0a8832eae685db24..10ad964ed8201ba7ee629c592b17ff770e255436 100644 (file)
--- a/arch/arm/cpu/sa1100/timer.c
+++ b/arch/arm/cpu/sa1100/timer.c
@@ -44,11 +44,6 @@ ulong get_timer (ulong base)
        return get_timer_masked ();
 }
 
-void set_timer (ulong t)
-{
-       /* nop */
-}
-
 void __udelay (unsigned long usec)
 {
        udelay_masked (usec);

diff --git a/arch/avr32/cpu/interrupts.c b/arch/avr32/cpu/interrupts.c
index c6ea435c1d7dd8d3a777602f0ab8e3c86a4eb283..8406f912246114e77c804d13f41fd4e0c5c6470d 100644 (file)
--- a/arch/avr32/cpu/interrupts.c
+++ b/arch/avr32/cpu/interrupts.c
@@ -77,22 +77,6 @@ unsigned long get_timer(unsigned long base)
        return (unsigned long)(now >> 32) - base;
 }
 
-void set_timer(unsigned long t)
-{
-       unsigned long long ticks = t;
-       unsigned long lo, hi, hi_new;
-
-       ticks = (ticks * get_tbclk()) / CONFIG_SYS_HZ;
-       hi = ticks >> 32;
-       lo = ticks & 0xffffffffUL;
-
-       do {
-               timer_overflow = hi;
-               sysreg_write(COUNT, lo);
-               hi_new = timer_overflow;
-       } while (hi_new != hi);
-}
-
 /*
  * For short delays only. It will overflow after a few seconds.
  */

diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
index 8dc010a3521aca6219a5a7d596ecfdda049a4167..49dba6ac6ac0474ca1eb7b80496139442fbc6ab0 100644 (file)
--- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
+++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
@@ -105,8 +105,4 @@ ulong get_timer(ulong base)
        return (timestamp - base);
 }
 
-void set_timer(ulong t)
-{
-       timestamp = t;
-}
 #endif                         /* CONFIG_SLTTMR */

diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index 6a892db649cdaf6e03a881960a9f2139b4803480..945ab66d92ca1bb57a5de6e315dcafdf1efa5450 100644 (file)
--- a/arch/m68k/lib/board.c
+++ b/arch/m68k/lib/board.c
@@ -574,8 +574,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
 
        udelay (20);
 
-       set_timer (0);
-
        /* Insert function pointers now that we have relocated the code */
 
        /* Initialize from environment */

diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index 7eaea5e7f77deddffede0a00cd5cdc03c4c45e5b..d10bcc7c16679b7569bd14a83050eeaf62f14e73 100644 (file)
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -126,10 +126,6 @@ ulong get_timer(ulong base)
        return (timestamp - base);
 }
 
-void set_timer(ulong t)
-{
-       timestamp = t;
-}
 #endif                         /* CONFIG_MCFTMR */
 
 #if defined(CONFIG_MCFPIT)
@@ -173,14 +169,6 @@ void timer_init(void)
        timerp->pcsr |= PIT_PCSR_PRE(CONFIG_SYS_PIT_PRESCALE) | PIT_PCSR_EN;
 }
 
-void set_timer(ulong t)
-{
-       volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_PIT_BASE);
-
-       timestamp = 0;
-       timerp->pmr = lastinc = 0;
-}
-
 ulong get_timer(ulong base)
 {
        unsigned short now, diff;
@@ -196,8 +184,8 @@ ulong get_timer(ulong base)
 
 void wait_ticks(unsigned long ticks)
 {
-       set_timer(0);
-       while (get_timer(0) < ticks) ;
+       u32 start = get_timer(0);
+       while (get_timer(start) < ticks) ;
 }
 #endif                         /* CONFIG_MCFPIT */
 

diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 4936c628abe06a8e00759020b797a80cf8100dd6..59ed126487fca4d2534d9cab9a39712a9e10b463 100644 (file)
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -45,11 +45,6 @@ ulong get_timer (ulong base)
 }
 #endif
 
-void set_timer (ulong t)
-{
-       timestamp = t;
-}
-
 #ifdef CONFIG_SYS_INTC_0
 #ifdef CONFIG_SYS_TIMER_0
 microblaze_timer_t *tmr = (microblaze_timer_t *) (CONFIG_SYS_TIMER_0_ADDR);

diff --git a/arch/mips/cpu/mips32/time.c b/arch/mips/cpu/mips32/time.c
index 0e6644149b476f6b6e03071815490226721376d2..b0a9c1f671e0dddec3aeeec3117117e8461f3feb 100644 (file)
--- a/arch/mips/cpu/mips32/time.c
+++ b/arch/mips/cpu/mips32/time.c
@@ -64,12 +64,6 @@ ulong get_timer(ulong base)
        return (timestamp - base);
 }
 
-void set_timer(ulong t)
-{
-       timestamp = t;
-       write_c0_compare(read_c0_count() + CYCLES_PER_JIFFY);
-}
-
 void __udelay(unsigned long usec)
 {
        unsigned int tmo;

diff --git a/arch/nios2/cpu/interrupts.c b/arch/nios2/cpu/interrupts.c
index 63acfa9147d3a479e49dd5a16730c3c13e18216a..0a97fa6b6b513ffe5bd9898bc4f0f515b3640a9d 100644 (file)
--- a/arch/nios2/cpu/interrupts.c
+++ b/arch/nios2/cpu/interrupts.c
@@ -98,12 +98,6 @@ ulong get_timer (ulong base)
        return (timestamp - base);
 }
 
-void set_timer (ulong t)
-{
-       timestamp = t;
-}
-
-
 /* The board must handle this interrupt if a timer is not
  * provided.
  */

diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index aaa5add1fa5bc4bda439ee5430f655747640fbb9..22bbc52da55066b0387d9dc09f6c5cf256ca69be 100644 (file)
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -932,8 +932,6 @@ void board_init_r (gd_t *id, ulong dest_addr)
 
        udelay (20);
 
-       set_timer (0);
-
        /* Initialize from environment */
        if ((s = getenv ("loadaddr")) != NULL) {
                load_addr = simple_strtoul (s, NULL, 16);

diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index f6031707aeb1805f7f7ad5e253a5bc910b27e660..847ad37a288ef43a4f08a100be93894f6ae27b23 100644 (file)
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -146,8 +146,3 @@ ulong get_timer (ulong base)
 {
        return (timestamp - base);
 }
-
-void set_timer (ulong t)
-{
-       timestamp = t;
-}

diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c
index bc1656f73ce535685e6563433f94ad0aa7d62a38..c4bfc8638c6ce385e9582c035f4abafe9338edd5 100644 (file)
--- a/arch/sh/lib/time.c
+++ b/arch/sh/lib/time.c
@@ -139,15 +139,10 @@ unsigned long get_timer (unsigned long base)
        return tick_to_time(get_ticks()) - base;
 }
 
-void set_timer (unsigned long t)
-{
-       writel((0 - t), TCNT0);
-}
-
 void reset_timer (void)
 {
        tmu_timer_stop(0);
-       set_timer (0);
+       writel(0, TCNT0);
        tmu_timer_start(0);
 }
 

diff --git a/arch/sh/lib/time_sh2.c b/arch/sh/lib/time_sh2.c
index 789b46f0e0261273cfb2545f34bfc3254a7be29c..a5c838bff0d8473f38dcd0528a46cf662898af98 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,15 +90,10 @@ 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);
+       writew(CMT_TIMER_RESET, CMCOR_0);
        cmt0_timer = 0;
        cmt_timer_start(0);
 }

diff --git a/arch/sparc/lib/board.c b/arch/sparc/lib/board.c
index 386cd041938ff15da72262aa6287a103d56ab881..6b705e531900686a599c51fe9e08deea2b59a0ae 100644 (file)
--- a/arch/sparc/lib/board.c
+++ b/arch/sparc/lib/board.c
@@ -365,8 +365,6 @@ void board_init_f(ulong bootflag)
 
        udelay(20);
 
-       set_timer(0);
-
        /* Initialize from environment */
        if ((s = getenv("loadaddr")) != NULL) {
                load_addr = simple_strtoul(s, NULL, 16);

diff --git a/arch/sparc/lib/interrupts.c b/arch/sparc/lib/interrupts.c
index 4c73b82a6fd4754c0bb4978c2956f057488c8b15..5274311a64007bd9a188fabe03d1434b1b8ba455 100644 (file)
--- a/arch/sparc/lib/interrupts.c
+++ b/arch/sparc/lib/interrupts.c
@@ -100,11 +100,6 @@ ulong get_timer(ulong base)
        return (timestamp - base);
 }
 
-void set_timer(ulong t)
-{
-       timestamp = t;
-}
-
 void timer_interrupt_init(void)
 {
        int irq;

diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index df54222211ad1ad098e36a27a9a2ced78006c1ad..c92291bc1ff6ff89b95a710c80ae857813266f5e 100644 (file)
--- a/arch/x86/lib/board.c
+++ b/arch/x86/lib/board.c
@@ -363,8 +363,6 @@ void board_init_r(gd_t *id, ulong dest_addr)
 
        udelay(20);
 
-       set_timer (0);
-
        /* Initialize from environment */
        if ((s = getenv ("loadaddr")) != NULL) {
                load_addr = simple_strtoul (s, NULL, 16);

diff --git a/arch/x86/lib/timer.c b/arch/x86/lib/timer.c
index 8fc68cdcb899a72b87e8b8aec4f26c1f92860a32..199ca8e5e7d516eb1eceba6aaa5653daeff22e0c 100644 (file)
--- a/arch/x86/lib/timer.c
+++ b/arch/x86/lib/timer.c
@@ -103,8 +103,3 @@ ulong get_timer (ulong base)
 {
        return (system_ticks - base);
 }
-
-void set_timer (ulong t)
-{
-       system_ticks = t;
-}

diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c
index 7562ffa87d71141fe17cae13d8dbde65fef18ec2..5406066d151be8e320f31372240236065f11a530 100644 (file)
--- a/board/armltd/integrator/timer.c
+++ b/board/armltd/integrator/timer.c
@@ -117,12 +117,6 @@ ulong get_timer (ulong base_ticks)
        return get_timer_masked () - base_ticks;
 }
 
-void set_timer (ulong ticks)
-{
-       timestamp   = ticks;
-       total_count = ticks * div_timer;
-}
-
 /* delay usec useconds */
 void __udelay (unsigned long usec)
 {

diff --git a/include/common.h b/include/common.h
index c5d2dcedf3607fafb15df2d035122b04f57570b1..2c779ed83d1ac53f42603bfd6304d2a22d57ce79 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -587,7 +587,6 @@ void        irq_install_handler(int, interrupt_handler_t *, void *);
 void   irq_free_handler   (int);
 void   reset_timer        (void);
 ulong  get_timer          (ulong base);
-void   set_timer          (ulong t);
 void   enable_interrupts  (void);
 int    disable_interrupts (void);