mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
1af87d9126
3.2.16 is the final release in the 3.2-stable series by Greg KH. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From cd7bf853d4130f7b81d066e7760289e3485beb4b Mon Sep 17 00:00:00 2001
|
|
From: Ludovic Desroches <ludovic.desroches@atmel.com>
|
|
Date: Wed, 28 Mar 2012 12:28:33 +0200
|
|
Subject: [PATCH 41/60] mmc: atmel-mci: correct data timeout computation
|
|
|
|
commit 66292ad92c6d3f2f1c137a1c826b331ca8595dfd upstream.
|
|
|
|
The HSMCI operates at a rate of up to Master Clock divided by two.
|
|
Moreover previous calculation can cause overflows and so wrong
|
|
timeouts.
|
|
|
|
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
|
|
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
|
|
Signed-off-by: Chris Ball <cjb@laptop.org>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/mmc/host/atmel-mci.c | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
|
|
index 9896933..0932024 100644
|
|
--- a/drivers/mmc/host/atmel-mci.c
|
|
+++ b/drivers/mmc/host/atmel-mci.c
|
|
@@ -480,7 +480,14 @@ err:
|
|
static inline unsigned int atmci_ns_to_clocks(struct atmel_mci *host,
|
|
unsigned int ns)
|
|
{
|
|
- return (ns * (host->bus_hz / 1000000) + 999) / 1000;
|
|
+ /*
|
|
+ * It is easier here to use us instead of ns for the timeout,
|
|
+ * it prevents from overflows during calculation.
|
|
+ */
|
|
+ unsigned int us = DIV_ROUND_UP(ns, 1000);
|
|
+
|
|
+ /* Maximum clock frequency is host->bus_hz/2 */
|
|
+ return us * (DIV_ROUND_UP(host->bus_hz, 2000000));
|
|
}
|
|
|
|
static void atmci_set_timeout(struct atmel_mci *host,
|
|
--
|
|
1.7.9.5
|
|
|