Signed-off-by: Graeme Russ graeme.r...@gmail.com
---
drivers/fpga/ACEX1K.c |5 ++-
drivers/fpga/cyclon2.c|5 ++-
drivers/fpga/spartan2.c | 30 +++
drivers/fpga/spartan3.c | 32 +
drivers/fpga/virtex2.c| 20 -
drivers/i2c/bfin-twi_i2c.c|6 ++--
drivers/i2c/spr_i2c.c | 28 ++
drivers/i2c/u8500_i2c.c |8 ++--
drivers/input/ps2mult.c |6 ++--
drivers/mmc/omap_hsmmc.c | 57 -
drivers/mtd/spi/atmel.c |4 +-
drivers/net/4xx_enet.c|8 ++---
drivers/net/bcm570x.c |2 +-
drivers/net/cs8900.c | 17 ++-
drivers/net/dm9000x.c |6 ++--
drivers/net/ethoc.c |6 ++--
drivers/net/fec_mxc.c | 18 ++--
drivers/net/ftgmac100.c |6 ++--
drivers/net/ftmac100.c|6 ++--
drivers/net/greth.c | 16 +-
drivers/net/lan91c96.c|5 ++-
drivers/net/ne2000_base.c |6 ++--
drivers/net/netarm_eth.c | 12 ---
drivers/net/ns7520_eth.c |5 ++-
drivers/net/ns9750_eth.c |4 +-
drivers/net/rtl8139.c |6 ++--
drivers/net/rtl8169.c | 26 -
drivers/net/smc9.c|4 +-
drivers/serial/serial_clps7111.c |6 ++--
drivers/serial/serial_netarm.c|4 +-
drivers/spi/atmel_dataflash_spi.c |8 ++---
drivers/usb/gadget/ether.c| 25
drivers/usb/host/ehci-hcd.c |8 ++--
drivers/usb/host/sl811-hcd.c |5 ++-
34 files changed, 220 insertions(+), 190 deletions(-)
diff --git a/drivers/fpga/ACEX1K.c b/drivers/fpga/ACEX1K.c
index 06b4247..7a8e744 100644
--- a/drivers/fpga/ACEX1K.c
+++ b/drivers/fpga/ACEX1K.c
@@ -156,10 +156,11 @@ static int ACEX1K_ps_load (Altera_desc * desc, void *buf,
size_t bsize)
udelay(2); /* T_cf2st1 4us */
/* Wait for nSTATUS to be released (i.e. deasserted) */
- ts = get_timer (0); /* get current time */
+ ts = timer_ms_now();/* get current time */
do {
CONFIG_FPGA_DELAY ();
- if (get_timer (ts) CONFIG_SYS_FPGA_WAIT) {/*
check the time */
+ if (time_ms_delta_min(ts, timer_ms_now())
+ CONFIG_SYS_FPGA_WAIT) { /* check the time */
puts (** Timeout waiting for STATUS to go
high.\n);
(*fn-abort) (cookie);
return FPGA_FAIL;
diff --git a/drivers/fpga/cyclon2.c b/drivers/fpga/cyclon2.c
index 4622b4e..5dd6cdd 100644
--- a/drivers/fpga/cyclon2.c
+++ b/drivers/fpga/cyclon2.c
@@ -139,10 +139,11 @@ static int CYC2_ps_load (Altera_desc * desc, void *buf,
size_t bsize)
udelay(2); /* T_cfg 2us */
/* Wait for nSTATUS to be asserted */
- ts = get_timer (0); /* get current time */
+ ts = time_now_ms(); /* get current time */
do {
CONFIG_FPGA_DELAY ();
- if (get_timer (ts) CONFIG_SYS_FPGA_WAIT) {/*
check the time */
+ /* check the time */
+ if (time_since_ms(ts) CONFIG_SYS_FPGA_WAIT) {
puts (** Timeout waiting for STATUS to go
high.\n);
(*fn-abort) (cookie);
return FPGA_FAIL;
diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c
index cd16a9c..cab68ef 100644
--- a/drivers/fpga/spartan2.c
+++ b/drivers/fpga/spartan2.c
@@ -168,11 +168,12 @@ static int Spartan2_sp_load (Xilinx_desc * desc, void
*buf, size_t bsize)
CONFIG_FPGA_DELAY ();
(*fn-pgm) (FALSE, TRUE, cookie); /* Deassert the
program, commit */
- ts = get_timer (0); /* get current time */
+ ts = time_now_ms(); /* get current time */
/* Now wait for INIT and BUSY to go high */
do {
CONFIG_FPGA_DELAY ();
- if (get_timer (ts) CONFIG_SYS_FPGA_WAIT) {/*
check the time */
+ /* check the time */
+ if (time_sine_ms(ts) CONFIG_SYS_FPGA_WAIT) {
puts (** Timeout waiting for INIT to
clear.\n);
(*fn-abort) (cookie); /* abort the burn */
return FPGA_FAIL;
@@ -195,7 +196,7 @@ static int Spartan2_sp_load (Xilinx_desc * desc, void *buf,
size_t bsize)
