46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From fa836dde1adf33d1c8f6caae9db365f06061b954 Mon Sep 17 00:00:00 2001
|
|
From: Juerg Haefliger <juergh@canonical.com>
|
|
Date: Wed, 29 Sep 2021 11:39:46 +0200
|
|
Subject: [PATCH] Revert "mmc: sdhci-iproc: Fix vmmc regulators on
|
|
iProc"
|
|
|
|
This reverts commit aed19399a01733dbad9be8bf026a4f7dd823b04f.
|
|
|
|
Commit 6c92ae1e452f ("mmc: sdhci: Introduce sdhci_set_power_and_bus_voltage()")
|
|
introduced a generic helper that does the same thing so use that instead in
|
|
the following commit.
|
|
|
|
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
|
|
---
|
|
drivers/mmc/host/sdhci-iproc.c | 12 ------------
|
|
1 file changed, 12 deletions(-)
|
|
|
|
--- a/drivers/mmc/host/sdhci-iproc.c
|
|
+++ b/drivers/mmc/host/sdhci-iproc.c
|
|
@@ -173,17 +173,6 @@ static unsigned int sdhci_iproc_get_max_
|
|
return pltfm_host->clock;
|
|
}
|
|
|
|
-static void sdhci_iproc_set_power(struct sdhci_host *host, unsigned char mode,
|
|
- unsigned short vdd)
|
|
-{
|
|
- if (!IS_ERR(host->mmc->supply.vmmc)) {
|
|
- struct mmc_host *mmc = host->mmc;
|
|
-
|
|
- mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
|
|
- }
|
|
- sdhci_set_power_noreg(host, mode, vdd);
|
|
-}
|
|
-
|
|
/*
|
|
* There is a known bug on BCM2711's SDHCI core integration where the
|
|
* controller will hang when the difference between the core clock and the bus
|
|
@@ -218,7 +207,6 @@ static const struct sdhci_ops sdhci_ipro
|
|
.write_b = sdhci_iproc_writeb,
|
|
.set_clock = sdhci_set_clock,
|
|
.get_max_clock = sdhci_iproc_get_max_clock,
|
|
- .set_power = sdhci_iproc_set_power,
|
|
.set_bus_width = sdhci_set_bus_width,
|
|
.reset = sdhci_reset,
|
|
.set_uhs_signaling = sdhci_set_uhs_signaling,
|