Commit 7b7e7168 authored by Ben Chuang's avatar Ben Chuang Committed by Ulf Hansson
Browse files

mmc: sdhci: Move the code related to setting the clock from... 


mmc: sdhci: Move the code related to setting the clock from sdhci_set_ios_common() into sdhci_set_ios()

The sdhci_set_clock() is called in sdhci_set_ios_common() and
__sdhci_uhs2_set_ios(). According to Section 3.13.2 "Card Interface
Detection Sequence" of the SD Host Controller Standard Specification
Version 7.00, the SD clock is supplied after power is supplied, so we only
need one in __sdhci_uhs2_set_ios(). Let's move the code related to setting
the clock from sdhci_set_ios_common() into sdhci_set_ios() and modify
the parameters passed to sdhci_set_clock() in __sdhci_uhs2_set_ios().

Fixes: 10c8298a ("mmc: sdhci-uhs2: add set_ios()")
Cc: stable@vger.kernel.org # v6.13+
Signed-off-by: default avatarBen Chuang <ben.chuang@genesyslogic.com.tw>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 8ab2f1c3

drivers/mmc/host/sdhci-uhs2.c

+2 −1
Original line number Diff line number Diff line
@@ -295,7 +295,8 @@ static void __sdhci_uhs2_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	else

		sdhci_uhs2_set_power(host, ios->power_mode, ios->vdd);



	sdhci_set_clock(host, host->clock);

	sdhci_set_clock(host, ios->clock);

	host->clock = ios->clock;

}



static int sdhci_uhs2_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)

drivers/mmc/host/sdhci.c

+17 −17
Original line number Diff line number Diff line
@@ -2367,23 +2367,6 @@ void sdhci_set_ios_common(struct mmc_host *mmc, struct mmc_ios *ios) 
		(ios->power_mode == MMC_POWER_UP) &&

		!(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN))

		sdhci_enable_preset_value(host, false);



	if (!ios->clock || ios->clock != host->clock) {

		host->ops->set_clock(host, ios->clock);

		host->clock = ios->clock;



		if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK &&

		    host->clock) {

			host->timeout_clk = mmc->actual_clock ?

						mmc->actual_clock / 1000 :

						host->clock / 1000;

			mmc->max_busy_timeout =

				host->ops->get_max_timeout_count ?

				host->ops->get_max_timeout_count(host) :

				1 << 27;

			mmc->max_busy_timeout /= host->timeout_clk;

		}

	}

}

EXPORT_SYMBOL_GPL(sdhci_set_ios_common);
@@ -2410,6 +2393,23 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 


	sdhci_set_ios_common(mmc, ios);



	if (!ios->clock || ios->clock != host->clock) {

		host->ops->set_clock(host, ios->clock);

		host->clock = ios->clock;



		if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK &&

		    host->clock) {

			host->timeout_clk = mmc->actual_clock ?

						mmc->actual_clock / 1000 :

						host->clock / 1000;

			mmc->max_busy_timeout =

				host->ops->get_max_timeout_count ?

				host->ops->get_max_timeout_count(host) :

				1 << 27;

			mmc->max_busy_timeout /= host->timeout_clk;

		}

	}



	if (host->ops->set_power)

		host->ops->set_power(host, ios->power_mode, ios->vdd);

	else