Commit 115ed5cb authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.16-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.17.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 7531f570 dcc3bcfc

drivers/mmc/host/sdhci.c

+2 −7
Original line number Diff line number Diff line
@@ -2065,15 +2065,10 @@ void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) 


	host->mmc->actual_clock = 0;



	clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL);

	if (clk & SDHCI_CLOCK_CARD_EN)

		sdhci_writew(host, clk & ~SDHCI_CLOCK_CARD_EN,

			SDHCI_CLOCK_CONTROL);



	if (clock == 0) {

	sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);



	if (clock == 0)

		return;

	}



	clk = sdhci_calc_clk(host, clock, &host->mmc->actual_clock);

	sdhci_enable_clk(host, clk);