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

Commit 611d059f authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'fixes' into next

parents 966580ad c7151602

drivers/mmc/host/dw_mmc.c

+6 −3
Original line number Diff line number Diff line
@@ -389,7 +389,9 @@ static inline void dw_mci_set_cto(struct dw_mci *host) 
	cto_div = (mci_readl(host, CLKDIV) & 0xff) * 2;

	if (cto_div == 0)

		cto_div = 1;

	cto_ms = DIV_ROUND_UP(MSEC_PER_SEC * cto_clks * cto_div, host->bus_hz);



	cto_ms = DIV_ROUND_UP_ULL((u64)MSEC_PER_SEC * cto_clks * cto_div,

				  host->bus_hz);



	/* add a bit spare time */

	cto_ms += 10;
@@ -1924,7 +1926,8 @@ static void dw_mci_set_drto(struct dw_mci *host) 
	drto_div = (mci_readl(host, CLKDIV) & 0xff) * 2;

	if (drto_div == 0)

		drto_div = 1;

	drto_ms = DIV_ROUND_UP(MSEC_PER_SEC * drto_clks * drto_div,



	drto_ms = DIV_ROUND_UP_ULL((u64)MSEC_PER_SEC * drto_clks * drto_div,

				   host->bus_hz);



	/* add a bit spare time */