X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm2708%2Fpatches-3.10%2F0010-sdcard-patch-improvements-from-naren.patch;fp=target%2Flinux%2Fbrcm2708%2Fpatches-3.10%2F0010-sdcard-patch-improvements-from-naren.patch;h=0000000000000000000000000000000000000000;hb=f22e896c92f3ac082885d7b08709a96885e787f0;hp=3ff7e12fa1916e908b9509988a97f0dafb15f327;hpb=77243e62456b647b2873e32cd5c6b41e7b1722a8;p=openwrt.git

diff --git a/target/linux/brcm2708/patches-3.10/0010-sdcard-patch-improvements-from-naren.patch b/target/linux/brcm2708/patches-3.10/0010-sdcard-patch-improvements-from-naren.patch
deleted file mode 100644
index 3ff7e12fa1..0000000000
--- a/target/linux/brcm2708/patches-3.10/0010-sdcard-patch-improvements-from-naren.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c655ceea69b95ccf2cc486a83048e41c3f664d1f Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Thu, 17 May 2012 14:44:19 +0100
-Subject: [PATCH 010/196] sdcard patch improvements from naren
-
----
- drivers/mmc/host/sdhci-bcm2708.c | 23 +++++++----------------
- 1 file changed, 7 insertions(+), 16 deletions(-)
-
-diff --git a/drivers/mmc/host/sdhci-bcm2708.c b/drivers/mmc/host/sdhci-bcm2708.c
-index a405114..ae8edf7 100644
---- a/drivers/mmc/host/sdhci-bcm2708.c
-+++ b/drivers/mmc/host/sdhci-bcm2708.c
-@@ -886,8 +886,7 @@ static void sdhci_bcm2708_dma_complete_irq(struct sdhci_host *host,
- 		   We get CRC and DEND errors unless we wait for
- 		   the SD controller to finish reading/writing to the card. */
- 		u32 state_mask;
--		int timeout=1000000;
--		hptime_t now = hptime();
-+		int timeout=1000;
- 
- 		DBG("PDMA over - sync card\n");
- 		if (data->flags & MMC_DATA_READ)
-@@ -895,17 +894,12 @@ static void sdhci_bcm2708_dma_complete_irq(struct sdhci_host *host,
- 		else
- 			state_mask = SDHCI_DOING_WRITE;
- 
--		while (0 != (sdhci_bcm2708_raw_readl(host,
--						     SDHCI_PRESENT_STATE) &
--			     state_mask) && --timeout > 0)
-+		while (0 != (sdhci_bcm2708_raw_readl(host, SDHCI_PRESENT_STATE) 
-+			& state_mask) && --timeout > 0)
-+		{
-+			udelay(100);
- 			continue;
--
--		if (1000000-timeout > 4000) /*ave. is about 3250*/
--			DBG("%s: note - long %s sync %luns - "
--			       "%d its.\n",
--			       mmc_hostname(host->mmc),
--			       data->flags & MMC_DATA_READ? "read": "write",
--			       since_ns(now), 1000000-timeout);
-+		}
- 		if (timeout <= 0)
- 			printk(KERN_ERR"%s: final %s to SD card still "
- 			       "running\n",
-@@ -1175,10 +1169,7 @@ static unsigned int sdhci_bcm2708_uhs_broken(struct sdhci_host *host)
- 
- static unsigned int sdhci_bcm2708_missing_status(struct sdhci_host *host)
- {
--	if(host->last_cmdop == MMC_SEND_STATUS)
--		return 1;
--	else
--		return 0;
-+	return 1;
- }
- 
- /***************************************************************************** \
--- 
-1.9.1
-