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

Commit c919c2a0 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Chris Ball
Browse files

mmc: tmio: fix .set_ios(MMC_POWER_UP) handling 



The aggressive clock gating for TMIO MMC patch has broken switching
interface power on, using MFD or platform callbacks. Restore the
ios->power_mode == MMC_POWER_UP && ios->clock == 0 case handling.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 26fc8775

drivers/mmc/host/tmio_mmc_pio.c

+5 −5
Original line number Diff line number Diff line
@@ -728,15 +728,15 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
		tmio_mmc_set_clock(host, ios->clock);



	/* Power sequence - OFF -> UP -> ON */

	if (ios->power_mode == MMC_POWER_OFF || !ios->clock) {

	if (ios->power_mode == MMC_POWER_UP) {

		/* power up SD bus */

		if (host->set_pwr)

			host->set_pwr(host->pdev, 1);

	} else if (ios->power_mode == MMC_POWER_OFF || !ios->clock) {

		/* power down SD bus */

		if (ios->power_mode == MMC_POWER_OFF && host->set_pwr)

			host->set_pwr(host->pdev, 0);

		tmio_mmc_clk_stop(host);

	} else if (ios->power_mode == MMC_POWER_UP) {

		/* power up SD bus */

		if (host->set_pwr)

			host->set_pwr(host->pdev, 1);

	} else {

		/* start bus clock */

		tmio_mmc_clk_start(host);