Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 729adf1b authored by Cliff Cai's avatar Cliff Cai Committed by Linus Torvalds
Browse files

mmc: bfin_sdh: set timeout based on actual card data 



The hardcoded value doesn't really work for all cards.

Signed-off-by: default avatarCliff Cai <cliff.cai@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 05dabcc4

drivers/mmc/host/bfin_sdh.c

+6 −2
Original line number Diff line number Diff line
@@ -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) {