aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-2.6.35/810-mmc-fixes.patch
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2010-08-08 16:38:39 +0000
committerMichael Büsch <mb@bu3sch.de>2010-08-08 16:38:39 +0000
commitd9c0e977a403e56e892ea5601efe4e44a12c6c65 (patch)
tree0d9beafba8e2bb34ade70737018cf0355642c0aa /target/linux/omap24xx/patches-2.6.35/810-mmc-fixes.patch
parent975ba9a88d9b529457e2b6bdced86d7918421bfe (diff)
downloadupstream-d9c0e977a403e56e892ea5601efe4e44a12c6c65.tar.gz
upstream-d9c0e977a403e56e892ea5601efe4e44a12c6c65.tar.bz2
upstream-d9c0e977a403e56e892ea5601efe4e44a12c6c65.zip
omap24xx: Support booting userland from MMC card
SVN-Revision: 22531
Diffstat (limited to 'target/linux/omap24xx/patches-2.6.35/810-mmc-fixes.patch')
-rw-r--r--target/linux/omap24xx/patches-2.6.35/810-mmc-fixes.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/target/linux/omap24xx/patches-2.6.35/810-mmc-fixes.patch b/target/linux/omap24xx/patches-2.6.35/810-mmc-fixes.patch
new file mode 100644
index 0000000000..614a496ebc
--- /dev/null
+++ b/target/linux/omap24xx/patches-2.6.35/810-mmc-fixes.patch
@@ -0,0 +1,64 @@
+---
+ 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(-)
+
+--- linux-2.6.35.orig/drivers/mmc/host/omap.c
++++ linux-2.6.35/drivers/mmc/host/omap.c
+@@ -387,7 +387,7 @@ mmc_omap_start_command(struct mmc_omap_h
+
+ 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,
+@@ -1455,6 +1455,7 @@ static int __init mmc_omap_probe(struct
+ 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)
+@@ -1494,7 +1495,9 @@ static int __init mmc_omap_probe(struct
+ }
+ }
+
+- 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;
+
+--- linux-2.6.35.orig/drivers/mmc/core/core.c
++++ linux-2.6.35/drivers/mmc/core/core.c
+@@ -73,12 +73,13 @@ static int mmc_schedule_delayed_work(str
+ }
+
+ /*
+- * 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
+--- linux-2.6.35.orig/include/linux/mmc/host.h
++++ linux-2.6.35/include/linux/mmc/host.h
+@@ -264,5 +264,7 @@ static inline void mmc_set_disable_delay
+ host->disable_delay = disable_delay;
+ }
+
++void mmc_flush_scheduled_work(void);
++
+ #endif
+