diff mbox

[U-Boot,v1,(WIP),06/16,Timer] Fix at91rm9200/spi.c timer usage

Message ID 1309261269-4363-7-git-send-email-graeme.russ@gmail.com
State Accepted
Commit 53fc43c68243d5278e522c92002fce3b8cc979a9
Headers show

Commit Message

Graeme Russ June 28, 2011, 11:40 a.m. UTC 
Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
---
 arch/arm/cpu/arm920t/at91rm9200/spi.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Comments

Andreas Bießmann June 28, 2011, 12:30 p.m. UTC | #1 
Dear Graeme Russ,

Am 28.06.2011 13:40, schrieb Graeme Russ:
> 
> Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
> ---
>  arch/arm/cpu/arm920t/at91rm9200/spi.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)

don't mind arm920t/at91rm9200, it will be removed in this merge window
(see end of doc/README.at91-soc and various discussion threads).

regards

Andreas Bießmann
diff mbox

Patch

diff --git a/arch/arm/cpu/arm920t/at91rm9200/spi.c b/arch/arm/cpu/arm920t/at91rm9200/spi.c
index f3cb5d8..c70efc6 100644
--- a/arch/arm/cpu/arm920t/at91rm9200/spi.c
+++ b/arch/arm/cpu/arm920t/at91rm9200/spi.c
@@ -108,6 +108,7 @@  void AT91F_SpiEnable(int cs)
 unsigned int AT91F_SpiWrite ( AT91PS_DataflashDesc pDesc )
 {
 	unsigned int timeout;
+	unsigned long start;
 
 	pDesc->state = BUSY;
 
@@ -132,12 +133,12 @@  unsigned int AT91F_SpiWrite ( AT91PS_DataflashDesc pDesc )
 	}
 
 	/* arm simple, non interrupt dependent timer */
-	reset_timer_masked();
+	start = get_timer(0);
 	timeout = 0;
 
 	AT91C_BASE_SPI->SPI_PTCR = AT91C_PDC_TXTEN + AT91C_PDC_RXTEN;
 	while(!(AT91C_BASE_SPI->SPI_SR & AT91C_SPI_RXBUFF) &&
-		((timeout = get_timer_masked() ) < CONFIG_SYS_SPI_WRITE_TOUT));
+		((timeout = get_timer(start) ) < CONFIG_SYS_SPI_WRITE_TOUT));
 	AT91C_BASE_SPI->SPI_PTCR = AT91C_PDC_TXTDIS + AT91C_PDC_RXTDIS;
 	pDesc->state = IDLE;