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

Commit b8f9f0e9 authored by Juha Yrjola's avatar Juha Yrjola Committed by Pierre Ossman
Browse files

MMC: OMAP: Fix timeout calculation for MMC multislot support 



Fix the data timeout calculation for MMC multislot support.

Signed-off-by: default avatarJuha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: default avatarJarkko Lavinen <jarkko.lavinen@nokia.com>
Signed-off-by: default avatarCarlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent a914ded2

drivers/mmc/host/omap.c

+4 −5
Original line number Diff line number Diff line
@@ -861,13 +861,12 @@ static inline void set_cmd_timeout(struct mmc_omap_host *host, struct mmc_reques 


static inline void set_data_timeout(struct mmc_omap_host *host, struct mmc_request *req)

{

	int timeout;

	unsigned int timeout, cycle_ns;

	u16 reg;



	/* Convert ns to clock cycles by assuming 20MHz frequency

	 * 1 cycle at 20MHz = 500 ns

	 */

	timeout = req->data->timeout_clks + req->data->timeout_ns / 500;

	cycle_ns = 1000000000 / host->current_slot->fclk_freq;

	timeout = req->data->timeout_ns / cycle_ns;

	timeout += req->data->timeout_clks;



	/* Check if we need to use timeout multiplier register */

	reg = OMAP_MMC_READ(host, SDIO);