diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-26 15:45:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-26 15:45:27 -0700 |
| commit | a82642fa190029a438c0d09edb0e5463a0fe9e1e (patch) | |
| tree | 92919f355dbf3f401a5ad96359dd6a741cd24f6a /drivers | |
| parent | 58f8236bed448273cd7f9ae02c09467853303484 (diff) | |
| parent | 3d63abe56be2147891b3438cb3bd37a9be72bda7 (diff) | |
| download | op-kernel-dev-a82642fa190029a438c0d09edb0e5463a0fe9e1e.zip op-kernel-dev-a82642fa190029a438c0d09edb0e5463a0fe9e1e.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc:
[MMC] pxamci: fix data timeout calculation
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/pxamci.c | 10 |
1 files changed, 4 insertions, 6 deletions
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 pxamci_host *host, unsigned int mask) 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 pxamci_host *host, struct mmc_data *data) 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) { |
