omap24xx: Add 3.1 patchset.

[openwrt.git] / target / linux / omap24xx / patches-3.1 / 810-mmc-fixes.patch

diff --git a/target/linux/omap24xx/patches-3.1/810-mmc-fixes.patch b/target/linux/omap24xx/patches-3.1/810-mmc-fixes.patch
new file mode 100644 (file)
index 0000000..2770968
--- /dev/null
+++ b/target/linux/omap24xx/patches-3.1/810-mmc-fixes.patch
@@ -0,0 +1,55 @@
+Index: linux-3.1-rc4/drivers/mmc/host/omap.c
+===================================================================
+--- linux-3.1-rc4.orig/drivers/mmc/host/omap.c 2011-08-29 06:16:01.000000000 +0200
++++ linux-3.1-rc4/drivers/mmc/host/omap.c      2011-10-27 16:48:04.389148259 +0200
+@@ -1456,6 +1456,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, resource_size(res));
+       if (!host->virt_base)
+@@ -1495,7 +1496,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;
+ 
+Index: linux-3.1-rc4/drivers/mmc/core/core.c
+===================================================================
+--- linux-3.1-rc4.orig/drivers/mmc/core/core.c 2011-08-29 06:16:01.000000000 +0200
++++ linux-3.1-rc4/drivers/mmc/core/core.c      2011-10-27 16:48:04.389148259 +0200
+@@ -76,12 +76,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
+Index: linux-3.1-rc4/include/linux/mmc/host.h
+===================================================================
+--- linux-3.1-rc4.orig/include/linux/mmc/host.h        2011-08-29 06:16:01.000000000 +0200
++++ linux-3.1-rc4/include/linux/mmc/host.h     2011-10-27 16:49:05.240930665 +0200
+@@ -394,4 +394,7 @@ static inline int mmc_host_cmd23(struct
+ {
+       return host->caps & MMC_CAP_CMD23;
+ }
++
++void mmc_flush_scheduled_work(void);
++
+ #endif /* LINUX_MMC_HOST_H */