target/linux/omap24xx/patches-2.6.36/810-mmc-fixes.patch

   1 ---
   2  drivers/mmc/core/core.c  |    5 +++--
   3  drivers/mmc/host/omap.c  |    7 +++++--
   4  include/linux/mmc/host.h |    2 ++
   5  3 files changed, 10 insertions(+), 4 deletions(-)
   6
   7 --- linux-2.6.36-rc4.orig/drivers/mmc/host/omap.c
   8 +++ linux-2.6.36-rc4/drivers/mmc/host/omap.c
   9 @@ -387,7 +387,7 @@ mmc_omap_start_command(struct mmc_omap_h
  10
  11         mod_timer(&host->cmd_abort_timer, jiffies + HZ/2);
  12
  13 -       OMAP_MMC_WRITE(host, CTO, 200);
  14 +//     OMAP_MMC_WRITE(host, CTO, 200);
  15         OMAP_MMC_WRITE(host, ARGL, cmd->arg & 0xffff);
  16         OMAP_MMC_WRITE(host, ARGH, cmd->arg >> 16);
  17         OMAP_MMC_WRITE(host, IE,
  18 @@ -1455,6 +1455,7 @@ static int __init mmc_omap_probe(struct
  19         host->dma_ch = -1;
  20
  21         host->irq = irq;
  22 +       host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
  23         host->phys_base = host->mem_res->start;
  24         host->virt_base = ioremap(res->start, res->end - res->start + 1);
  25         if (!host->virt_base)
  26 @@ -1494,7 +1495,9 @@ static int __init mmc_omap_probe(struct
  27                 }
  28         }
  29
  30 -       host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
  31 +       /* Make sure the detect workqueue was run at least once. */
  32 +       printk(KERN_INFO "OMAP-mmc: waiting for cards...\n");
  33 +       mmc_flush_scheduled_work();
  34
  35         return 0;
  36
  37 --- linux-2.6.36-rc4.orig/drivers/mmc/core/core.c
  38 +++ linux-2.6.36-rc4/drivers/mmc/core/core.c
  39 @@ -73,12 +73,13 @@ static int mmc_schedule_delayed_work(str
  40  }
  41
  42  /*
  43 - * Internal function. Flush all scheduled work from the MMC work queue.
  44 + * Flush all scheduled work from the MMC work queue.
  45   */
  46 -static void mmc_flush_scheduled_work(void)
  47 +void mmc_flush_scheduled_work(void)
  48  {
  49         flush_workqueue(workqueue);
  50  }
  51 +EXPORT_SYMBOL(mmc_flush_scheduled_work);
  52
  53  /**
  54   *     mmc_request_done - finish processing an MMC request
  55 --- linux-2.6.36-rc4.orig/include/linux/mmc/host.h
  56 +++ linux-2.6.36-rc4/include/linux/mmc/host.h
  57 @@ -268,5 +268,7 @@ static inline void mmc_set_disable_delay
  58         host->disable_delay = disable_delay;
  59  }
  60
  61 +void mmc_flush_scheduled_work(void);
  62 +
  63  #endif
  64