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

Commit 01ffb1ae authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: tmio: don't wait on R-Car2+ when handling the clock 



Our hardware engineers confirmed that it is unnecessary to wait when
turning the clock on/off. The documentation was a tad vague, so we
used to play safe.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 5af02d32

drivers/mmc/host/tmio_mmc_core.c

+8 −2
Original line number Diff line number Diff line
@@ -207,7 +207,10 @@ static void tmio_mmc_clk_start(struct tmio_mmc_host *host) 
{

	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, CLK_CTL_SCLKEN |

		sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));

	msleep(host->pdata->flags & TMIO_MMC_MIN_RCAR2 ? 1 : 10);



	/* HW engineers overrode docs: no sleep needed on R-Car2+ */

	if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2))

		msleep(10);



	if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) {

		sd_ctrl_write16(host, CTL_CLK_AND_WAIT_CTL, 0x0100);
@@ -224,7 +227,10 @@ static void tmio_mmc_clk_stop(struct tmio_mmc_host *host) 


	sd_ctrl_write16(host, CTL_SD_CARD_CLK_CTL, ~CLK_CTL_SCLKEN &

		sd_ctrl_read16(host, CTL_SD_CARD_CLK_CTL));

	msleep(host->pdata->flags & TMIO_MMC_MIN_RCAR2 ? 5 : 10);



	/* HW engineers overrode docs: no sleep needed on R-Car2+ */

	if (!(host->pdata->flags & TMIO_MMC_MIN_RCAR2))

		msleep(10);

}



static void tmio_mmc_set_clock(struct tmio_mmc_host *host,