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

[openwrt/openwrt.git] / target / linux / brcm2708 / patches-3.10 / 0037-Allow-the-number-of-cycles-delay-between-sdcard-peri.patch

diff --git a/target/linux/brcm2708/patches-3.10/0037-Allow-the-number-of-cycles-delay-between-sdcard-peri.patch b/target/linux/brcm2708/patches-3.10/0037-Allow-the-number-of-cycles-delay-between-sdcard-peri.patch
index 8961a2308382fc5437e2a9822d34e5cb23871d57..d128d8ca4da0ad9453390c1a29bd56c59d3b8d1e 100644 (file)
--- a/target/linux/brcm2708/patches-3.10/0037-Allow-the-number-of-cycles-delay-between-sdcard-peri.patch
+++ b/target/linux/brcm2708/patches-3.10/0037-Allow-the-number-of-cycles-delay-between-sdcard-peri.patch
@@ -1,7 +1,7 @@
-From addefb978a42b1699979ef8ecef08a01977dfd7d Mon Sep 17 00:00:00 2001
+From 674d82a3db9b47a7772ac732a560979ea22d5c3d Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Wed, 3 Oct 2012 21:31:48 +0100
-Subject: [PATCH 037/174] Allow the number of cycles delay between sdcard
+Subject: [PATCH 037/196] Allow the number of cycles delay between sdcard
  peripheral writes to be specified on command line with
  sdhci-bcm2708.cycle_delay
 
@@ -9,6 +9,8 @@ Subject: [PATCH 037/174] Allow the number of cycles delay between sdcard
  drivers/mmc/host/sdhci-bcm2708.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
+diff --git a/drivers/mmc/host/sdhci-bcm2708.c b/drivers/mmc/host/sdhci-bcm2708.c
+index 7ce2829..ffd7310 100644
 --- a/drivers/mmc/host/sdhci-bcm2708.c
 +++ b/drivers/mmc/host/sdhci-bcm2708.c
 @@ -77,6 +77,8 @@
@@ -20,7 +22,7 @@ Subject: [PATCH 037/174] Allow the number of cycles delay between sdcard
  /*****************************************************************************\
   *                                                                         *
   * Debug                                                                   *
-@@ -249,7 +251,7 @@ static void sdhci_bcm2708_raw_writel(str
+@@ -249,7 +251,7 @@ static void sdhci_bcm2708_raw_writel(struct sdhci_host *host, u32 val, int reg)
                /* host->clock is the clock freq in Hz */
                static hptime_t last_write_hpt;
                hptime_t now = hptime();
@@ -29,7 +31,7 @@ Subject: [PATCH 037/174] Allow the number of cycles delay between sdcard
  
                if (now == last_write_hpt || now == last_write_hpt+1) {
                         /* we can't guarantee any significant time has
-@@ -1388,6 +1390,7 @@ module_param(emmc_clock_freq, int, 0444)
+@@ -1388,6 +1390,7 @@ module_param(emmc_clock_freq, int, 0444);
  module_param(sync_after_dma, bool, 0444);
  module_param(missing_status, bool, 0444);
  module_param(enable_llm, bool, 0444);
@@ -37,3 +39,6 @@ Subject: [PATCH 037/174] Allow the number of cycles delay between sdcard
  
  MODULE_DESCRIPTION("Secure Digital Host Controller Interface platform driver");
  MODULE_AUTHOR("Broadcom <info@broadcom.com>");
+-- 
+1.9.1
+