All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/2] Fix timer usage of the Atmel SPI dataflash driver
@ 2011-01-27 22:46 Remy Bohmer
  2011-01-27 22:46 ` [U-Boot] [PATCH 2/2] at91sam9261ek: make operational again Remy Bohmer
  2011-04-18 10:36 ` [U-Boot] [PATCH 1/2] Fix timer usage of the Atmel SPI dataflash driver Reinhard Meyer
  0 siblings, 2 replies; 12+ messages in thread
From: Remy Bohmer @ 2011-01-27 22:46 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Remy Bohmer <linux@bohmer.net>
---
 drivers/spi/atmel_dataflash_spi.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/atmel_dataflash_spi.c b/drivers/spi/atmel_dataflash_spi.c
index 4a5c4aa..2f23f54 100644
--- a/drivers/spi/atmel_dataflash_spi.c
+++ b/drivers/spi/atmel_dataflash_spi.c
@@ -133,7 +133,7 @@ unsigned int AT91F_SpiWrite1(AT91PS_DataflashDesc pDesc);
 
 unsigned int AT91F_SpiWrite(AT91PS_DataflashDesc pDesc)
 {
-	unsigned int timeout;
+	u32 time_start, timeout;
 
 	pDesc->state = BUSY;
 
@@ -158,12 +158,12 @@ unsigned int AT91F_SpiWrite(AT91PS_DataflashDesc pDesc)
 	}
 
 	/* arm simple, non interrupt dependent timer */
-	reset_timer_masked();
-	timeout = 0;
+	time_start = get_timer(0);
 
 	writel(AT91_SPI_TXTEN + AT91_SPI_RXTEN, AT91_BASE_SPI + AT91_SPI_PTCR);
 	while (!(readl(AT91_BASE_SPI + AT91_SPI_SR) & AT91_SPI_RXBUFF) &&
-		((timeout = get_timer_masked()) < CONFIG_SYS_SPI_WRITE_TOUT));
+		((timeout = get_timer(time_start)) < CONFIG_SYS_SPI_WRITE_TOUT));
+
 	writel(AT91_SPI_TXTDIS + AT91_SPI_RXTDIS, AT91_BASE_SPI + AT91_SPI_PTCR);
 	pDesc->state = IDLE;
 
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2011-04-18 10:36 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-27 22:46 [U-Boot] [PATCH 1/2] Fix timer usage of the Atmel SPI dataflash driver Remy Bohmer
2011-01-27 22:46 ` [U-Boot] [PATCH 2/2] at91sam9261ek: make operational again Remy Bohmer
2011-01-27 22:49   ` Remy Bohmer
2011-01-27 23:11   ` Albert ARIBAUD
2011-01-28 20:38     ` Remy Bohmer
2011-02-01 10:45   ` Michael Trimarchi
2011-02-01 12:16     ` Albert ARIBAUD
2011-02-01 19:11       ` Michael Trimarchi
2011-02-01 19:31         ` Remy Bohmer
2011-02-01 19:54       ` Reinhard Meyer
2011-02-05 12:54         ` Remy Bohmer
2011-04-18 10:36 ` [U-Boot] [PATCH 1/2] Fix timer usage of the Atmel SPI dataflash driver Reinhard Meyer

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.