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

Commit ee67cef1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled" 



This reverts commit 1796ae6a which is
commit 477865af60b2117ceaa1d558e03559108c15c78c upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I272ec31b8761b964b9aa66f2b55938a317b8aa2e
parent ee9bfb84

drivers/mmc/host/sdhci-sprd.c

+0 −25
Original line number Diff line number Diff line
@@ -392,33 +392,12 @@ static void sdhci_sprd_request_done(struct sdhci_host *host, 
	 mmc_request_done(host->mmc, mrq);

}



static void sdhci_sprd_set_power(struct sdhci_host *host, unsigned char mode,

				 unsigned short vdd)

{

	struct mmc_host *mmc = host->mmc;



	switch (mode) {

	case MMC_POWER_OFF:

		mmc_regulator_set_ocr(host->mmc, mmc->supply.vmmc, 0);



		mmc_regulator_disable_vqmmc(mmc);

		break;

	case MMC_POWER_ON:

		mmc_regulator_enable_vqmmc(mmc);

		break;

	case MMC_POWER_UP:

		mmc_regulator_set_ocr(host->mmc, mmc->supply.vmmc, vdd);

		break;

	}

}



static struct sdhci_ops sdhci_sprd_ops = {

	.read_l = sdhci_sprd_readl,

	.write_l = sdhci_sprd_writel,

	.write_w = sdhci_sprd_writew,

	.write_b = sdhci_sprd_writeb,

	.set_clock = sdhci_sprd_set_clock,

	.set_power = sdhci_sprd_set_power,

	.get_max_clock = sdhci_sprd_get_max_clock,

	.get_min_clock = sdhci_sprd_get_min_clock,

	.set_bus_width = sdhci_set_bus_width,
@@ -684,10 +663,6 @@ static int sdhci_sprd_probe(struct platform_device *pdev) 
	host->caps1 &= ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_SDR104 |

			 SDHCI_SUPPORT_DDR50);



	ret = mmc_regulator_get_supply(host->mmc);

	if (ret)

		goto pm_runtime_disable;



	ret = sdhci_setup_host(host);

	if (ret)

		goto pm_runtime_disable;