public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Reinhard Meyer <u-boot@emk-elektronik.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/4] atmel_dataflash: remove use of get_timer_masked
Date: Mon, 18 Apr 2011 12:41:14 +0200	[thread overview]
Message-ID: <4DAC154A.6080500@emk-elektronik.de> (raw)
In-Reply-To: <82e06e94bd8fce0bb50e7e4347dfaffa43c4b2d3.1303118067.git.rubini@gnudd.com>

Dear Alessandro Rubini:
> Commit 5dca710a3d7703e41da0e9894f2d71f9e25bea6b removed
> get_timer_masked for at91. The dataflash driver was still
> using it and so stopped compiling.  This blindly fixes
> the compilation problem (I am not currently using dataflash).
> 
> Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
> ---
>  drivers/spi/atmel_dataflash_spi.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/spi/atmel_dataflash_spi.c b/drivers/spi/atmel_dataflash_spi.c
> index 4a5c4aa..d5215c0 100644
> --- a/drivers/spi/atmel_dataflash_spi.c
> +++ b/drivers/spi/atmel_dataflash_spi.c
> @@ -158,12 +158,12 @@ unsigned int AT91F_SpiWrite(AT91PS_DataflashDesc pDesc)
>  	}
>  
>  	/* arm simple, non interrupt dependent timer */
> -	reset_timer_masked();
> +	reset_timer();
>  	timeout = 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(0)) < CONFIG_SYS_SPI_WRITE_TOUT));
>  	writel(AT91_SPI_TXTDIS + AT91_SPI_RXTDIS, AT91_BASE_SPI + AT91_SPI_PTCR);
>  	pDesc->state = IDLE;
>  
a) reset_timer(), and all *_masked() timer functions are depreciated and have been
   removed from AT91 timer code
b) the problem has already been fixed in current u-boot-atmel/next

Best Regards,
Reinhard

      parent reply	other threads:[~2011-04-18 10:41 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-18  9:20 [U-Boot] [PATCH 1/4] atmel_dataflash: remove use of get_timer_masked Alessandro Rubini
2011-04-18  9:20 ` [U-Boot] [PATCH 2/4] ARM: don't relocate if we are already too high Alessandro Rubini
2011-04-18  9:21 ` [U-Boot] [PATCH 3/4] at91sam9261/g10: support relocation Alessandro Rubini
2011-04-18  9:32   ` Andreas Bießmann
2011-04-18  9:21 ` [U-Boot] [PATCH 4/4] at91sam9261/g10: move config from Makefile to boards.cfg Alessandro Rubini
2011-04-18 10:41 ` Reinhard Meyer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4DAC154A.6080500@emk-elektronik.de \
    --to=u-boot@emk-elektronik.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox