diff options
| author | Cliff Cai <cliff.cai@analog.com> | 2010-03-05 13:43:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 11:26:36 -0800 |
| commit | 729adf1b5f4562f67fe8bf6c1df97edc1128fac7 (patch) | |
| tree | ab22de5d498c5ee960b72b046ee73dc1c56bea01 /drivers | |
| parent | 05dabcc4a51eab7342b2220f0121b4f4a5109386 (diff) | |
| download | linux-3.10-729adf1b5f4562f67fe8bf6c1df97edc1128fac7.tar.gz linux-3.10-729adf1b5f4562f67fe8bf6c1df97edc1128fac7.tar.bz2 linux-3.10-729adf1b5f4562f67fe8bf6c1df97edc1128fac7.zip | |
mmc: bfin_sdh: set timeout based on actual card data
The hardcoded value doesn't really work for all cards.
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/bfin_sdh.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c index f218a996455..56f7b448b91 100644 --- a/drivers/mmc/host/bfin_sdh.c +++ b/drivers/mmc/host/bfin_sdh.c @@ -115,6 +115,7 @@ static int sdh_setup_data(struct sdh_host *host, struct mmc_data *data) unsigned int length; unsigned int data_ctl; unsigned int dma_cfg; + unsigned int cycle_ns, timeout; dev_dbg(mmc_dev(host->mmc), "%s enter flags: 0x%x\n", __func__, data->flags); host->data = data; @@ -135,8 +136,11 @@ static int sdh_setup_data(struct sdh_host *host, struct mmc_data *data) data_ctl |= ((ffs(data->blksz) - 1) << 4); bfin_write_SDH_DATA_CTL(data_ctl); - - bfin_write_SDH_DATA_TIMER(0xFFFF); + /* the time of a host clock period in ns */ + cycle_ns = 1000000000 / (get_sclk() / (2 * (host->clk_div + 1))); + timeout = data->timeout_ns / cycle_ns; + timeout += data->timeout_clks; + bfin_write_SDH_DATA_TIMER(timeout); SSYNC(); if (data->flags & MMC_DATA_READ) { |