Commit 0a446288 authored by Takeshi Saito's avatar Takeshi Saito Committed by Ulf Hansson
Browse files

mmc: tmio: restore bus width when resetting 



Resetting the IP core will lose the bus width information and not all
code paths recover it. So, make sure the latest bus width gets restored
in the reset routine. For that, tmio_mmc_set_bus_width() is moved, but
not modified.

Signed-off-by: default avatarTakeshi Saito <takeshi.saito.xv@renesas.com>
[wsa: reworded commit message]
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20210316085717.7276-2-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 6b0e0fce

drivers/mmc/host/tmio_mmc_core.c

+17 −15
Original line number Diff line number Diff line
@@ -164,6 +164,21 @@ static void tmio_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) 
	}

}



static void tmio_mmc_set_bus_width(struct tmio_mmc_host *host,

				   unsigned char bus_width)

{

	u16 reg = sd_ctrl_read16(host, CTL_SD_MEM_CARD_OPT)

				& ~(CARD_OPT_WIDTH | CARD_OPT_WIDTH8);



	/* reg now applies to MMC_BUS_WIDTH_4 */

	if (bus_width == MMC_BUS_WIDTH_1)

		reg |= CARD_OPT_WIDTH;

	else if (bus_width == MMC_BUS_WIDTH_8)

		reg |= CARD_OPT_WIDTH8;



	sd_ctrl_write16(host, CTL_SD_MEM_CARD_OPT, reg);

}



static void tmio_mmc_reset(struct tmio_mmc_host *host)

{

	/* FIXME - should we set stop clock reg here */
@@ -177,6 +192,8 @@ static void tmio_mmc_reset(struct tmio_mmc_host *host) 
	if (host->reset)

		host->reset(host);



	tmio_mmc_set_bus_width(host, host->mmc->ios.bus_width);



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

		sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask);

		sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0001);
@@ -874,21 +891,6 @@ static void tmio_mmc_power_off(struct tmio_mmc_host *host) 
		host->set_pwr(host->pdev, 0);

}



static void tmio_mmc_set_bus_width(struct tmio_mmc_host *host,

				   unsigned char bus_width)

{

	u16 reg = sd_ctrl_read16(host, CTL_SD_MEM_CARD_OPT)

				& ~(CARD_OPT_WIDTH | CARD_OPT_WIDTH8);



	/* reg now applies to MMC_BUS_WIDTH_4 */

	if (bus_width == MMC_BUS_WIDTH_1)

		reg |= CARD_OPT_WIDTH;

	else if (bus_width == MMC_BUS_WIDTH_8)

		reg |= CARD_OPT_WIDTH8;



	sd_ctrl_write16(host, CTL_SD_MEM_CARD_OPT, reg);

}



static unsigned int tmio_mmc_get_timeout_cycles(struct tmio_mmc_host *host)

{

	u16 val = sd_ctrl_read16(host, CTL_SD_MEM_CARD_OPT);