git.openwrt.org Git - openwrt/staging/rmilecki.git/blob

   1 From fa836dde1adf33d1c8f6caae9db365f06061b954 Mon Sep 17 00:00:00 2001
   2 From: Juerg Haefliger <juergh@canonical.com>
   3 Date: Wed, 29 Sep 2021 11:39:46 +0200
   4 Subject: [PATCH] Revert "mmc: sdhci-iproc: Fix vmmc regulators on
   5  iProc"
   6
   7 This reverts commit aed19399a01733dbad9be8bf026a4f7dd823b04f.
   8
   9 Commit 6c92ae1e452f ("mmc: sdhci: Introduce sdhci_set_power_and_bus_voltage()")
  10 introduced a generic helper that does the same thing so use that instead in
  11 the following commit.
  12
  13 Signed-off-by: Juerg Haefliger <juergh@canonical.com>
  14 ---
  15  drivers/mmc/host/sdhci-iproc.c | 12 ------------
  16  1 file changed, 12 deletions(-)
  17
  18 --- a/drivers/mmc/host/sdhci-iproc.c
  19 +++ b/drivers/mmc/host/sdhci-iproc.c
  20 @@ -173,17 +173,6 @@ static unsigned int sdhci_iproc_get_max_
  21                 return pltfm_host->clock;
  22  }
  23
  24 -static void sdhci_iproc_set_power(struct sdhci_host *host, unsigned char mode,
  25 -                                 unsigned short vdd)
  26 -{
  27 -       if (!IS_ERR(host->mmc->supply.vmmc)) {
  28 -               struct mmc_host *mmc = host->mmc;
  29 -
  30 -               mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
  31 -       }
  32 -       sdhci_set_power_noreg(host, mode, vdd);
  33 -}
  34 -
  35  /*
  36   * There is a known bug on BCM2711's SDHCI core integration where the
  37   * controller will hang when the difference between the core clock and the bus
  38 @@ -218,7 +207,6 @@ static const struct sdhci_ops sdhci_ipro
  39         .write_b = sdhci_iproc_writeb,
  40         .set_clock = sdhci_set_clock,
  41         .get_max_clock = sdhci_iproc_get_max_clock,
  42 -       .set_power = sdhci_iproc_set_power,
  43         .set_bus_width = sdhci_set_bus_width,
  44         .reset = sdhci_reset,
  45         .set_uhs_signaling = sdhci_set_uhs_signaling,