target/linux/brcm2708/patches-3.10/0100-sdhci-sdhci_bcm2708_quirk_voltage_broken-appears-to-.patch

   1 From 2b7ffec03e2dda5b3f78a354668e9bf1945f5805 Mon Sep 17 00:00:00 2001
   2 From: popcornmix <popcornmix@gmail.com>
   3 Date: Tue, 12 Nov 2013 23:01:30 +0000
   4 Subject: [PATCH 100/196] sdhci: sdhci_bcm2708_quirk_voltage_broken appears to
   5  be a no-op
   6
   7 ---
   8  drivers/mmc/host/sdhci-bcm2708.c | 6 ------
   9  drivers/mmc/host/sdhci.c         | 6 ------
  10  drivers/mmc/host/sdhci.h         | 1 -
  11  3 files changed, 13 deletions(-)
  12
  13 diff --git a/drivers/mmc/host/sdhci-bcm2708.c b/drivers/mmc/host/sdhci-bcm2708.c
  14 index 7fdd815..c775666 100644
  15 --- a/drivers/mmc/host/sdhci-bcm2708.c
  16 +++ b/drivers/mmc/host/sdhci-bcm2708.c
  17 @@ -1114,11 +1114,6 @@ static unsigned int sdhci_bcm2708_quirk_spurious_crc_acmd51(struct sdhci_host *h
  18          return 1;
  19  }
  20
  21 -static unsigned int sdhci_bcm2708_quirk_voltage_broken(struct sdhci_host *host)
  22 -{
  23 -        return 1;
  24 -}
  25 -
  26  static unsigned int sdhci_bcm2708_uhs_broken(struct sdhci_host *host)
  27  {
  28          return 1;
  29 @@ -1155,7 +1150,6 @@ static struct sdhci_ops sdhci_bcm2708_ops = {
  30         .pdma_reset = sdhci_bcm2708_platdma_reset,
  31  #endif
  32         .extra_ints = sdhci_bcm2708_quirk_extra_ints,
  33 -       .voltage_broken = sdhci_bcm2708_quirk_voltage_broken,
  34         .uhs_broken = sdhci_bcm2708_uhs_broken,
  35  };
  36
  37 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
  38 index 13e4e11..237158c 100644
  39 --- a/drivers/mmc/host/sdhci.c
  40 +++ b/drivers/mmc/host/sdhci.c
  41 @@ -3245,12 +3245,6 @@ int sdhci_add_host(struct sdhci_host *host)
  42                                    SDHCI_MAX_CURRENT_MULTIPLIER;
  43         }
  44
  45 -       if(host->ops->voltage_broken) {
  46 -               ocr_avail |= MMC_VDD_32_33 | MMC_VDD_33_34;
  47 -               // Cannot support UHS modes if we are stuck at 3.3V;
  48 -               mmc->caps &= ~(MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_DDR50);
  49 -       }
  50 -
  51         mmc->ocr_avail = ocr_avail;
  52         mmc->ocr_avail_sdio = ocr_avail;
  53         if (host->ocr_avail_sdio)
  54 diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
  55 index cc393af..fc6fcf3 100644
  56 --- a/drivers/mmc/host/sdhci.h
  57 +++ b/drivers/mmc/host/sdhci.h
  58 @@ -299,7 +299,6 @@ struct sdhci_ops {
  59                                       struct mmc_data *data);
  60         unsigned int    (*extra_ints)(struct sdhci_host *host);
  61         unsigned int    (*spurious_crc_acmd51)(struct sdhci_host *host);
  62 -       unsigned int    (*voltage_broken)(struct sdhci_host *host);
  63         unsigned int    (*uhs_broken)(struct sdhci_host *host);
  64         unsigned int    (*missing_status)(struct sdhci_host *host);
  65
  66 --
  67 1.9.1
  68