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

Commit 79d5a65a authored May 07, 2015 by Adrian Hunter Committed by Ulf Hansson Jun 01, 2015

mmc: core: Enable / disable re-tuning



Enable re-tuning when tuning is executed and
disable re-tuning when card is no longer initialized.

In the case of SDIO suspend, the card can keep power.
In that case, re-tuning need not be disabled, but, if
a re-tuning timer is being used, ensure it is disabled
and assume that re-tuning will be needed upon resume
since it is not known how long the suspend will last.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent dfa13ebb

drivers/mmc/core/core.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1109,6 +1109,8 @@ int mmc_execute_tuning(struct mmc_card *card)

		if (err)
		pr_err("%s: tuning execution failed\n", mmc_hostname(host));
		else
		mmc_retune_enable(host);

		return err;
		}
		@@ -1140,6 +1142,8 @@ void mmc_set_bus_width(struct mmc_host *host, unsigned int width)
		*/
		void mmc_set_initial_state(struct mmc_host *host)
		{
		mmc_retune_disable(host);

		if (mmc_host_is_spi(host))
		host->ios.chip_select = MMC_CS_HIGH;
		else

drivers/mmc/core/sdio.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -934,8 +934,12 @@ static int mmc_sdio_suspend(struct mmc_host *host)
		mmc_release_host(host);
		}

		if (!mmc_card_keep_power(host))
		if (!mmc_card_keep_power(host)) {
		mmc_power_off(host);
		} else if (host->retune_period) {
		mmc_retune_timer_stop(host);
		mmc_retune_needed(host);
		}

		return 0;
		}