aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-3.10/0100-sdhci-sdhci_bcm2708_quirk_voltage_broken-appears-to-.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2014-02-28 20:30:08 +0000
committerFlorian Fainelli <florian@openwrt.org>2014-02-28 20:30:08 +0000
commit800930b924c19a56b3a6e94ad351cd0715fb410d (patch)
tree70158d97f68604d69da8da779507469cf930bf07 /target/linux/brcm2708/patches-3.10/0100-sdhci-sdhci_bcm2708_quirk_voltage_broken-appears-to-.patch
parent68c939ba0b0a0dda84e7a2ae370155be9a5593bc (diff)
downloadupstream-800930b924c19a56b3a6e94ad351cd0715fb410d.tar.gz
upstream-800930b924c19a56b3a6e94ad351cd0715fb410d.tar.bz2
upstream-800930b924c19a56b3a6e94ad351cd0715fb410d.zip
brcm2708: update against latest rpi-3.10.y branch
Update our copies of the brcm2708 patches to the latest rpi-3.10-y rebased against linux-3.10.y stable (3.10.32). This should hopefully make it easier for us in the future to leverage the raspberry/rpi-* branches. Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39770 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0100-sdhci-sdhci_bcm2708_quirk_voltage_broken-appears-to-.patch')
-rw-r--r--target/linux/brcm2708/patches-3.10/0100-sdhci-sdhci_bcm2708_quirk_voltage_broken-appears-to-.patch59
1 files changed, 59 insertions, 0 deletions
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
index 0000000000..770dd4d21f
--- /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);
+