1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
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.36-rc4.orig/drivers/mmc/host/omap.c
+++ linux-2.6.36-rc4/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.36-rc4.orig/drivers/mmc/core/core.c
+++ linux-2.6.36-rc4/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.36-rc4.orig/include/linux/mmc/host.h
+++ linux-2.6.36-rc4/include/linux/mmc/host.h
@@ -268,5 +268,7 @@ static inline void mmc_set_disable_delay
host->disable_delay = disable_delay;
}
+void mmc_flush_scheduled_work(void);
+
#endif
|
