brcm2708: update against latest rpi-3.10.y branch
[openwrt.git] / target / linux / brcm2708 / patches-3.10 / 0100-sdhci-sdhci_bcm2708_quirk_voltage_broken-appears-to-.patch
1 From 45f717497730b7e98f3bd934ba09757748d8418d 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/174] 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 --- a/drivers/mmc/host/sdhci-bcm2708.c
14 +++ b/drivers/mmc/host/sdhci-bcm2708.c
15 @@ -1114,11 +1114,6 @@ static unsigned int sdhci_bcm2708_quirk_
16          return 1;
17  }
18  
19 -static unsigned int sdhci_bcm2708_quirk_voltage_broken(struct sdhci_host *host)
20 -{
21 -        return 1;
22 -}
23 -
24  static unsigned int sdhci_bcm2708_uhs_broken(struct sdhci_host *host)
25  {
26          return 1;
27 @@ -1155,7 +1150,6 @@ static struct sdhci_ops sdhci_bcm2708_op
28         .pdma_reset = sdhci_bcm2708_platdma_reset,
29  #endif
30         .extra_ints = sdhci_bcm2708_quirk_extra_ints,
31 -       .voltage_broken = sdhci_bcm2708_quirk_voltage_broken,
32         .uhs_broken = sdhci_bcm2708_uhs_broken,
33  };
34  
35 --- a/drivers/mmc/host/sdhci.c
36 +++ b/drivers/mmc/host/sdhci.c
37 @@ -3245,12 +3245,6 @@ int sdhci_add_host(struct sdhci_host *ho
38                                    SDHCI_MAX_CURRENT_MULTIPLIER;
39         }
40  
41 -       if(host->ops->voltage_broken) {
42 -               ocr_avail |= MMC_VDD_32_33 | MMC_VDD_33_34;
43 -               // Cannot support UHS modes if we are stuck at 3.3V;
44 -               mmc->caps &= ~(MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_DDR50);
45 -       }
46 -
47         mmc->ocr_avail = ocr_avail;
48         mmc->ocr_avail_sdio = ocr_avail;
49         if (host->ocr_avail_sdio)
50 --- a/drivers/mmc/host/sdhci.h
51 +++ b/drivers/mmc/host/sdhci.h
52 @@ -299,7 +299,6 @@ struct sdhci_ops {
53                                       struct mmc_data *data);
54         unsigned int    (*extra_ints)(struct sdhci_host *host);
55         unsigned int    (*spurious_crc_acmd51)(struct sdhci_host *host);
56 -       unsigned int    (*voltage_broken)(struct sdhci_host *host);
57         unsigned int    (*uhs_broken)(struct sdhci_host *host);
58         unsigned int    (*missing_status)(struct sdhci_host *host);
59