1 files changed, 40 insertions, 7 deletions

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index b032828c6126..4a8776f8afdd 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -28,6 +28,7 @@
 #include <linux/clk.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/core.h>
+#include <linux/mmc/mmc.h>
 #include <linux/io.h>
 #include <linux/semaphore.h>
 #include <linux/gpio.h>
@@ -78,6 +79,7 @@
 #define INT_EN_MASK             0x307F0033
 #define BWR_ENABLE              (1 << 4)
 #define BRR_ENABLE              (1 << 5)
+#define DTO_ENABLE              (1 << 20)
 #define INIT_STREAM             (1 << 1)
 #define DP_SELECT               (1 << 21)
 #define DDIR                    (1 << 4)
@@ -523,7 +525,8 @@ static void omap_hsmmc_stop_clock(struct omap_hsmmc_host *host)
                 dev_dbg(mmc_dev(host->mmc), "MMC Clock is not stoped\n");
 }
 
-static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host)
+static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host,
+                                  struct mmc_command *cmd)
 {
         unsigned int irq_mask;
 
@@ -532,6 +535,10 @@ static void omap_hsmmc_enable_irq(struct omap_hsmmc_host *host)
         else
                 irq_mask = INT_EN_MASK;
 
+        /* Disable timeout for erases */
+        if (cmd->opcode == MMC_ERASE)
+                irq_mask &= ~DTO_ENABLE;
+
         OMAP_HSMMC_WRITE(host->base, STAT, STAT_CLEAR);
         OMAP_HSMMC_WRITE(host->base, ISE, irq_mask);
         OMAP_HSMMC_WRITE(host->base, IE, irq_mask);
@@ -782,7 +789,7 @@ omap_hsmmc_start_command(struct omap_hsmmc_host *host, struct mmc_command *cmd,
                 mmc_hostname(host->mmc), cmd->opcode, cmd->arg);
         host->cmd = cmd;
 
-        omap_hsmmc_enable_irq(host);
+        omap_hsmmc_enable_irq(host, cmd);
 
         host->response_busy = 0;
         if (cmd->flags & MMC_RSP_PRESENT) {
@@ -1273,8 +1280,11 @@ static void omap_hsmmc_dma_cb(int lch, u16 ch_status, void *cb_data)
         struct mmc_data *data = host->mrq->data;
         int dma_ch, req_in_progress;
 
-        if (ch_status & OMAP2_DMA_MISALIGNED_ERR_IRQ)
-                dev_dbg(mmc_dev(host->mmc), "MISALIGNED_ADRS_ERR\n");
+        if (!(ch_status & OMAP_DMA_BLOCK_IRQ)) {
+                dev_warn(mmc_dev(host->mmc), "unexpected dma status %x\n",
+                        ch_status);
+                return;
+        }
 
         spin_lock(&host->irq_lock);
         if (host->dma_ch < 0) {
@@ -1598,6 +1608,14 @@ static int omap_hsmmc_get_ro(struct mmc_host *mmc)
         return mmc_slot(host).get_ro(host->dev, 0);
 }
 
+static void omap_hsmmc_init_card(struct mmc_host *mmc, struct mmc_card *card)
+{
+        struct omap_hsmmc_host *host = mmc_priv(mmc);
+
+        if (mmc_slot(host).init_card)
+                mmc_slot(host).init_card(card);
+}
+
 static void omap_hsmmc_conf_bus_power(struct omap_hsmmc_host *host)
 {
         u32 hctl, capa, value;
@@ -1869,6 +1887,7 @@ static const struct mmc_host_ops omap_hsmmc_ops = {
         .set_ios = omap_hsmmc_set_ios,
         .get_cd = omap_hsmmc_get_cd,
         .get_ro = omap_hsmmc_get_ro,
+        .init_card = omap_hsmmc_init_card,
         /* NYET -- enable_sdio_irq */
 };
 
@@ -1879,6 +1898,7 @@ static const struct mmc_host_ops omap_hsmmc_ps_ops = {
         .set_ios = omap_hsmmc_set_ios,
         .get_cd = omap_hsmmc_get_cd,
         .get_ro = omap_hsmmc_get_ro,
+        .init_card = omap_hsmmc_init_card,
         /* NYET -- enable_sdio_irq */
 };
 
@@ -2094,12 +2114,25 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
         mmc->max_seg_size = mmc->max_req_size;
 
         mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
-                     MMC_CAP_WAIT_WHILE_BUSY;
+                     MMC_CAP_WAIT_WHILE_BUSY | MMC_CAP_ERASE;
 
-        if (mmc_slot(host).wires >= 8)
+        switch (mmc_slot(host).wires) {
+        case 8:
                 mmc->caps |= MMC_CAP_8_BIT_DATA;
-        else if (mmc_slot(host).wires >= 4)
+                /* Fall through */
+        case 4:
                 mmc->caps |= MMC_CAP_4_BIT_DATA;
+                break;
+        case 1:
+                /* Nothing to crib here */
+        case 0:
+                /* Assuming nothing was given by board, Core use's 1-Bit */
+                break;
+        default:
+                /* Completely unexpected.. Core goes with 1-Bit Width */
+                dev_crit(mmc_dev(host->mmc), "Invalid width %d\n used!"
+                        "using 1 instead\n", mmc_slot(host).wires);
+        }
 
         if (mmc_slot(host).nonremovable)
                 mmc->caps |= MMC_CAP_NONREMOVABLE;