Timer: Allow reset_timer() only for systems with low resolution timers

diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
index f9e175dcb830854cf573db9a9a0313b194e5b470..4407006a6f80f870a5a020b71ff4e17f424626d0 100644 (file)
--- a/drivers/block/mg_disk.c
+++ b/drivers/block/mg_disk.c
@@ -91,7 +91,9 @@ static unsigned int mg_wait (u32 expect, u32 msec)
        u32 from, cur, err;
 
        err = MG_ERR_NONE;
+#ifdef CONFIG_SYS_LOW_RES_TIMER
        reset_timer();
+#endif
        from = get_timer(0);
 
        status = readb(mg_base() + MG_REG_STATUS);

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 929f9a9d73469c74d75f35e4933199b2018da804..ac91dfd9536de74f13f82561ed10076b5918fecc 100644 (file)
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -573,7 +573,9 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector,
 #endif
 
        /* Wait for command completion */
+#ifdef CONFIG_SYS_LOW_RES_TIMER
        reset_timer();
+#endif
        start = get_timer (0);
        while (flash_is_busy (info, sector)) {
                if (get_timer (start) > tout) {
@@ -662,7 +664,9 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst,
 #endif
 
        /* Wait for command completion */
+#ifdef CONFIG_SYS_LOW_RES_TIMER
        reset_timer();
+#endif
        start = get_timer(0);
        while (1) {
                switch (info->portwidth) {

diff --git a/include/configs/PCI5441.h b/include/configs/PCI5441.h
index 70775e75fbbd632971f14c817c32fa83d68fa055..ae5bc2efeab7c95c17b1ef308dc8d0a3fcd5316f 100644 (file)
--- a/include/configs/PCI5441.h
+++ b/include/configs/PCI5441.h
@@ -118,6 +118,7 @@
  * TMRMS represents the desired mecs per tick (msecs per interrupt).
  *----------------------------------------------------------------------*/
 #define CONFIG_SYS_HZ                  1000    /* Always 1000 */
+#define CONFIG_SYS_LOW_RES_TIMER
 #define CONFIG_SYS_NIOS_TMRBASE        0x00920860      /* Tick timer base addr */
 #define CONFIG_SYS_NIOS_TMRIRQ         3       /* Timer IRQ num */
 #define CONFIG_SYS_NIOS_TMRMS          10      /* Desired period (msec)*/

diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h
index b466c4b05a28b01deef2eabe7b2f0b9a589c387b..95c30ccde655aa61b6426a4bdcb7222e55ca6f1c 100644 (file)
--- a/include/configs/PK1C20.h
+++ b/include/configs/PK1C20.h
@@ -128,6 +128,7 @@
  * TMRMS represents the desired mecs per tick (msecs per interrupt).
  *----------------------------------------------------------------------*/
 #define CONFIG_SYS_HZ                  1000    /* Always 1000 */
+#define CONFIG_SYS_LOW_RES_TIMER
 #define CONFIG_SYS_NIOS_TMRBASE        0x02120820      /* Tick timer base addr */
 #define CONFIG_SYS_NIOS_TMRIRQ         3       /* Timer IRQ num */
 #define CONFIG_SYS_NIOS_TMRMS          10      /* Desired period */

diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h
index 53f2084d9f770dbc9279e6838e0e92590fb38cee..d57d53cca564b89598638127b9b170fa1072a1f4 100644 (file)
--- a/include/configs/nios2-generic.h
+++ b/include/configs/nios2-generic.h
@@ -52,6 +52,7 @@
 /*
  * TIMER
  */
+#define CONFIG_SYS_LOW_RES_TIMER
 #define CONFIG_SYS_NIOS_TMRBASE        CONFIG_SYS_TIMER_BASE
 #define CONFIG_SYS_NIOS_TMRIRQ         CONFIG_SYS_TIMER_IRQ
 #define CONFIG_SYS_HZ                  1000    /* Always 1000 */