brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014

[14.07/openwrt.git] / target / linux / brcm2708 / patches-3.10 / 0018-Use-ndelay-rather-than-udelay.-Thanks-lb.patch

diff --git a/target/linux/brcm2708/patches-3.10/0018-Use-ndelay-rather-than-udelay.-Thanks-lb.patch b/target/linux/brcm2708/patches-3.10/0018-Use-ndelay-rather-than-udelay.-Thanks-lb.patch
index 00f04d8..63714cf 100644 (file)
--- a/target/linux/brcm2708/patches-3.10/0018-Use-ndelay-rather-than-udelay.-Thanks-lb.patch
+++ b/target/linux/brcm2708/patches-3.10/0018-Use-ndelay-rather-than-udelay.-Thanks-lb.patch
@@ -1,15 +1,17 @@
-From a56370b5a103f3949c5ed2997a971e1949a15132 Mon Sep 17 00:00:00 2001
+From 3755210aaea18a4531069911f36a4771339565c4 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Fri, 22 Jun 2012 12:57:42 +0100
-Subject: [PATCH 018/174] Use ndelay rather than udelay. Thanks lb
+Subject: [PATCH 018/196] Use ndelay rather than udelay. Thanks lb
 
 ---
  drivers/mmc/host/sdhci-bcm2708.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
+diff --git a/drivers/mmc/host/sdhci-bcm2708.c b/drivers/mmc/host/sdhci-bcm2708.c
+index b0cdd7d..7bba950 100644
 --- a/drivers/mmc/host/sdhci-bcm2708.c
 +++ b/drivers/mmc/host/sdhci-bcm2708.c
-@@ -249,14 +249,14 @@ static void sdhci_bcm2708_raw_writel(str
+@@ -249,14 +249,14 @@ static void sdhci_bcm2708_raw_writel(struct sdhci_host *host, u32 val, int reg)
                if (now == last_write_hpt || now == last_write_hpt+1) {
                         /* we can't guarantee any significant time has
                          * passed - we'll have to wait anyway ! */
@@ -26,7 +28,7 @@ Subject: [PATCH 018/174] Use ndelay rather than udelay. Thanks lb
                }
                last_write_hpt = now;
        }
-@@ -272,13 +272,13 @@ static void sdhci_bcm2708_raw_writel(str
+@@ -272,13 +272,13 @@ static void sdhci_bcm2708_raw_writel(struct sdhci_host *host, u32 val, int reg)
                ier &= ~SDHCI_INT_DATA_TIMEOUT;
                writel(ier, host->ioaddr + SDHCI_SIGNAL_ENABLE);
                timeout_disabled = true;
@@ -42,3 +44,6 @@ Subject: [PATCH 018/174] Use ndelay rather than udelay. Thanks lb
        }
  #endif
        writel(val, host->ioaddr + reg);
+-- 
+1.9.1
+