diff options
author | Michael Büsch <mb@bu3sch.de> | 2011-03-20 14:07:25 +0000 |
---|---|---|
committer | Michael Büsch <mb@bu3sch.de> | 2011-03-20 14:07:25 +0000 |
commit | 37548fcf607c78ab44bad904430f578fd4bc1f04 (patch) | |
tree | ce6c568928870c310b27f91c83cef0ef7e91de44 /target/linux/omap24xx/patches-2.6.37/810-mmc-fixes.patch | |
parent | 7b7242564ad77f6ad1fe00e61a2a6929e3334c23 (diff) | |
download | upstream-37548fcf607c78ab44bad904430f578fd4bc1f04.tar.gz upstream-37548fcf607c78ab44bad904430f578fd4bc1f04.tar.bz2 upstream-37548fcf607c78ab44bad904430f578fd4bc1f04.zip |
omap24xx: Update to 2.6.38. Remove 2.6.37 files
SVN-Revision: 26244
Diffstat (limited to 'target/linux/omap24xx/patches-2.6.37/810-mmc-fixes.patch')
-rw-r--r-- | target/linux/omap24xx/patches-2.6.37/810-mmc-fixes.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/target/linux/omap24xx/patches-2.6.37/810-mmc-fixes.patch b/target/linux/omap24xx/patches-2.6.37/810-mmc-fixes.patch deleted file mode 100644 index 96ef3ae3ea..0000000000 --- a/target/linux/omap24xx/patches-2.6.37/810-mmc-fixes.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- - drivers/mmc/core/core.c | 5 +++-- - drivers/mmc/host/omap.c | 7 +++++-- - include/linux/mmc/host.h | 2 ++ - 3 files changed, 10 insertions(+), 4 deletions(-) - -Index: linux-2.6.37/drivers/mmc/host/omap.c -=================================================================== ---- linux-2.6.37.orig/drivers/mmc/host/omap.c 2011-01-27 14:16:57.305000007 +0100 -+++ linux-2.6.37/drivers/mmc/host/omap.c 2011-01-27 14:17:59.807000006 +0100 -@@ -387,7 +387,7 @@ - - mod_timer(&host->cmd_abort_timer, jiffies + HZ/2); - -- OMAP_MMC_WRITE(host, CTO, 200); -+// OMAP_MMC_WRITE(host, CTO, 200); - OMAP_MMC_WRITE(host, ARGL, cmd->arg & 0xffff); - OMAP_MMC_WRITE(host, ARGH, cmd->arg >> 16); - OMAP_MMC_WRITE(host, IE, -@@ -1454,6 +1454,7 @@ - host->dma_ch = -1; - - host->irq = irq; -+ host->reg_shift = (cpu_is_omap7xx() ? 1 : 2); - host->phys_base = host->mem_res->start; - host->virt_base = ioremap(res->start, res->end - res->start + 1); - if (!host->virt_base) -@@ -1493,7 +1494,9 @@ - } - } - -- host->reg_shift = (cpu_is_omap7xx() ? 1 : 2); -+ /* Make sure the detect workqueue was run at least once. */ -+ printk(KERN_INFO "OMAP-mmc: waiting for cards...\n"); -+ mmc_flush_scheduled_work(); - - return 0; - -Index: linux-2.6.37/drivers/mmc/core/core.c -=================================================================== ---- linux-2.6.37.orig/drivers/mmc/core/core.c 2011-01-27 14:16:57.297000007 +0100 -+++ linux-2.6.37/drivers/mmc/core/core.c 2011-01-27 14:17:59.807000006 +0100 -@@ -74,12 +74,13 @@ - } - - /* -- * Internal function. Flush all scheduled work from the MMC work queue. -+ * Flush all scheduled work from the MMC work queue. - */ --static void mmc_flush_scheduled_work(void) -+void mmc_flush_scheduled_work(void) - { - flush_workqueue(workqueue); - } -+EXPORT_SYMBOL(mmc_flush_scheduled_work); - - /** - * mmc_request_done - finish processing an MMC request -Index: linux-2.6.37/include/linux/mmc/host.h -=================================================================== ---- linux-2.6.37.orig/include/linux/mmc/host.h 2011-01-27 14:16:57.292000007 +0100 -+++ linux-2.6.37/include/linux/mmc/host.h 2011-01-27 14:17:59.807000006 +0100 -@@ -307,5 +307,7 @@ - return !(host->caps & MMC_CAP_NONREMOVABLE) && mmc_assume_removable; - } - -+void mmc_flush_scheduled_work(void); -+ - #endif - |