diff mbox

[U-Boot,3/4] ARM: mmc: bcm283x: Remove get_timer_us() from mmc driver

Message ID 1430772877-7301-3-git-send-email-marex@denx.de
State Accepted
Delegated to: Pantelis Antoniou
Headers show

Commit Message

Marek Vasut May 4, 2015, 8:54 p.m. UTC
The get_timer_us() function is something which is no longer
existing in case we use generic timer framework, so replace
it with get_timer().

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Tyler Baker <tyler.baker@linaro.org>
---
 drivers/mmc/bcm2835_sdhci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Pantelis Antoniou May 5, 2015, 9:40 a.m. UTC | #1
Hi Marek,

> On May 4, 2015, at 23:54 , Marek Vasut <marex@denx.de> wrote:
> 
> The get_timer_us() function is something which is no longer
> existing in case we use generic timer framework, so replace
> it with get_timer().
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Stephen Warren <swarren@wwwdotorg.org>
> Cc: Tyler Baker <tyler.baker@linaro.org>
> ---
> drivers/mmc/bcm2835_sdhci.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
> index 4ec2968..0f81add 100644
> --- a/drivers/mmc/bcm2835_sdhci.c
> +++ b/drivers/mmc/bcm2835_sdhci.c
> @@ -69,11 +69,11 @@ static inline void bcm2835_sdhci_raw_writel(struct sdhci_host *host, u32 val,
> 	 * (Which is just as well - otherwise we'd have to nobble the DMA engine
> 	 * too)
> 	 */
> -	while (get_timer_us(bcm_host->last_write) < bcm_host->twoticks_delay)
> +	while (get_timer(bcm_host->last_write) < bcm_host->twoticks_delay)
> 		;
> 
> 	writel(val, host->ioaddr + reg);
> -	bcm_host->last_write = get_timer_us(0);
> +	bcm_host->last_write = get_timer(0);
> }
> 
> static inline u32 bcm2835_sdhci_raw_readl(struct sdhci_host *host, int reg)
> -- 
> 2.1.4

Applied, thanks.

— Pantelis
Stephen Warren June 16, 2015, 3:44 a.m. UTC | #2
On 05/04/2015 02:54 PM, Marek Vasut wrote:
> The get_timer_us() function is something which is no longer
> existing in case we use generic timer framework, so replace
> it with get_timer().

Marek,

This patch causes "saveenv" to got from almost no time to nearly 50s on
my RPi model A+. Can you take a look at that please?
diff mbox

Patch

diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
index 4ec2968..0f81add 100644
--- a/drivers/mmc/bcm2835_sdhci.c
+++ b/drivers/mmc/bcm2835_sdhci.c
@@ -69,11 +69,11 @@  static inline void bcm2835_sdhci_raw_writel(struct sdhci_host *host, u32 val,
 	 * (Which is just as well - otherwise we'd have to nobble the DMA engine
 	 * too)
 	 */
-	while (get_timer_us(bcm_host->last_write) < bcm_host->twoticks_delay)
+	while (get_timer(bcm_host->last_write) < bcm_host->twoticks_delay)
 		;
 
 	writel(val, host->ioaddr + reg);
-	bcm_host->last_write = get_timer_us(0);
+	bcm_host->last_write = get_timer(0);
 }
 
 static inline u32 bcm2835_sdhci_raw_readl(struct sdhci_host *host, int reg)