From 43d9b85117bd329cf24b23074726a08569b2efd6 Mon Sep 17 00:00:00 2001 From: mb Date: Sat, 26 Feb 2011 23:52:18 +0000 Subject: omap24xx: Add 2.6.38 files git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25746 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../omap24xx/patches-2.6.38/810-mmc-fixes.patch | 70 ++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch (limited to 'target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch') diff --git a/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch b/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch new file mode 100644 index 000000000..314285540 --- /dev/null +++ b/target/linux/omap24xx/patches-2.6.38/810-mmc-fixes.patch @@ -0,0 +1,70 @@ +--- + 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.38-rc6/drivers/mmc/host/omap.c +=================================================================== +--- linux-2.6.38-rc6.orig/drivers/mmc/host/omap.c 2011-02-22 02:25:52.000000000 +0100 ++++ linux-2.6.38-rc6/drivers/mmc/host/omap.c 2011-02-24 00:40:46.129908862 +0100 +@@ -389,7 +389,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, +@@ -1456,6 +1456,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) +@@ -1495,7 +1496,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.38-rc6/drivers/mmc/core/core.c +=================================================================== +--- linux-2.6.38-rc6.orig/drivers/mmc/core/core.c 2011-02-22 02:25:52.000000000 +0100 ++++ linux-2.6.38-rc6/drivers/mmc/core/core.c 2011-02-24 00:40:46.131908784 +0100 +@@ -75,12 +75,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.38-rc6/include/linux/mmc/host.h +=================================================================== +--- linux-2.6.38-rc6.orig/include/linux/mmc/host.h 2011-02-22 02:25:52.000000000 +0100 ++++ linux-2.6.38-rc6/include/linux/mmc/host.h 2011-02-24 00:40:46.131908784 +0100 +@@ -326,5 +326,7 @@ + return host->pm_flags & MMC_PM_KEEP_POWER; + } + ++void mmc_flush_scheduled_work(void); ++ + #endif + -- cgit v1.2.3