brcm2708: update against latest rpi-3.10.y branch

[15.05/openwrt.git] / target / linux / brcm2708 / patches-3.10 / 0100-sdhci-sdhci_bcm2708_quirk_voltage_broken-appears-to-.patch

diff --git a/target/linux/brcm2708/patches-3.10/0100-sdhci-sdhci_bcm2708_quirk_voltage_broken-appears-to-.patch b/target/linux/brcm2708/patches-3.10/0100-sdhci-sdhci_bcm2708_quirk_voltage_broken-appears-to-.patch
new file mode 100644 (file)
index 0000000..770dd4d
--- /dev/null
+++ b/target/linux/brcm2708/patches-3.10/0100-sdhci-sdhci_bcm2708_quirk_voltage_broken-appears-to-.patch
@@ -0,0 +1,59 @@
+From 45f717497730b7e98f3bd934ba09757748d8418d Mon Sep 17 00:00:00 2001
+From: popcornmix <popcornmix@gmail.com>
+Date: Tue, 12 Nov 2013 23:01:30 +0000
+Subject: [PATCH 100/174] sdhci: sdhci_bcm2708_quirk_voltage_broken appears to
+ be a no-op
+
+---
+ drivers/mmc/host/sdhci-bcm2708.c | 6 ------
+ drivers/mmc/host/sdhci.c         | 6 ------
+ drivers/mmc/host/sdhci.h         | 1 -
+ 3 files changed, 13 deletions(-)
+
+--- a/drivers/mmc/host/sdhci-bcm2708.c
++++ b/drivers/mmc/host/sdhci-bcm2708.c
+@@ -1114,11 +1114,6 @@ static unsigned int sdhci_bcm2708_quirk_
+         return 1;
+ }
+ 
+-static unsigned int sdhci_bcm2708_quirk_voltage_broken(struct sdhci_host *host)
+-{
+-        return 1;
+-}
+-
+ static unsigned int sdhci_bcm2708_uhs_broken(struct sdhci_host *host)
+ {
+         return 1;
+@@ -1155,7 +1150,6 @@ static struct sdhci_ops sdhci_bcm2708_op
+       .pdma_reset = sdhci_bcm2708_platdma_reset,
+ #endif
+       .extra_ints = sdhci_bcm2708_quirk_extra_ints,
+-      .voltage_broken = sdhci_bcm2708_quirk_voltage_broken,
+       .uhs_broken = sdhci_bcm2708_uhs_broken,
+ };
+ 
+--- a/drivers/mmc/host/sdhci.c
++++ b/drivers/mmc/host/sdhci.c
+@@ -3245,12 +3245,6 @@ int sdhci_add_host(struct sdhci_host *ho
+                                  SDHCI_MAX_CURRENT_MULTIPLIER;
+       }
+ 
+-      if(host->ops->voltage_broken) {
+-              ocr_avail |= MMC_VDD_32_33 | MMC_VDD_33_34;
+-              // Cannot support UHS modes if we are stuck at 3.3V;
+-              mmc->caps &= ~(MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_DDR50);
+-      }
+-
+       mmc->ocr_avail = ocr_avail;
+       mmc->ocr_avail_sdio = ocr_avail;
+       if (host->ocr_avail_sdio)
+--- a/drivers/mmc/host/sdhci.h
++++ b/drivers/mmc/host/sdhci.h
+@@ -299,7 +299,6 @@ struct sdhci_ops {
+                                     struct mmc_data *data);
+       unsigned int    (*extra_ints)(struct sdhci_host *host);
+       unsigned int    (*spurious_crc_acmd51)(struct sdhci_host *host);
+-      unsigned int    (*voltage_broken)(struct sdhci_host *host);
+       unsigned int    (*uhs_broken)(struct sdhci_host *host);
+       unsigned int    (*missing_status)(struct sdhci_host *host);
+