diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0518-Revert-mmc-sdhci-iproc-Fix-vmmc-regulators-on-iProc.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0518-Revert-mmc-sdhci-iproc-Fix-vmmc-regulators-on-iProc.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0518-Revert-mmc-sdhci-iproc-Fix-vmmc-regulators-on-iProc.patch b/target/linux/bcm27xx/patches-5.15/950-0518-Revert-mmc-sdhci-iproc-Fix-vmmc-regulators-on-iProc.patch new file mode 100644 index 0000000000..eab5502e7f --- /dev/null +++ b/target/linux/bcm27xx/patches-5.15/950-0518-Revert-mmc-sdhci-iproc-Fix-vmmc-regulators-on-iProc.patch @@ -0,0 +1,45 @@ +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, |