GIT 3d63abe56be2147891b3438cb3bd37a9be72bda7 git+ssh://master.kernel.org/home/rmk/linux-2.6-mmc.git

commit 3d63abe56be2147891b3438cb3bd37a9be72bda7
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date:   Mon Apr 24 11:27:02 2006 +0100

    [MMC] pxamci: fix data timeout calculation
    
    The MMC layer gives us two parts for the timeout calculation - a fixed
    timeout in nanoseconds, and a card clock-speed dependent part.
    
    The PXA MMC hardware allows for a timeout based on the fixed host clock
    speed only.  This resulted in some cards being given a short timeout,
    and therefore failing to work.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

---
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index eb9a882..eb42cb3 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -65,11 +65,6 @@ struct pxamci_host {
 	unsigned int		dma_dir;
 };
 
-static inline unsigned int ns_to_clocks(unsigned int ns)
-{
-	return (ns * (CLOCKRATE / 1000000) + 999) / 1000;
-}
-
 static void pxamci_stop_clock(struct pxamci_host *host)
 {
 	if (readl(host->base + MMC_STAT) & STAT_CLK_EN) {
@@ -113,6 +108,7 @@ static void pxamci_disable_irq(struct px
 static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data)
 {
 	unsigned int nob = data->blocks;
+	unsigned long long clks;
 	unsigned int timeout;
 	u32 dcmd;
 	int i;
@@ -125,7 +121,9 @@ static void pxamci_setup_data(struct pxa
 	writel(nob, host->base + MMC_NOB);
 	writel(1 << data->blksz_bits, host->base + MMC_BLKLEN);
 
-	timeout = ns_to_clocks(data->timeout_ns) + data->timeout_clks;
+	clks = (unsigned long long)data->timeout_ns * CLOCKRATE;
+	do_div(clks, 1000000000UL);
+	timeout = (unsigned int)clks + (data->timeout_clks << host->clkrt);
 	writel((timeout + 255) / 256, host->base + MMC_RDTO);
 
 	if (data->flags & MMC_DATA_READ) {