1 files changed, 36 insertions, 57 deletions

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 98b6b6ef7e5c..5c2e58b29305 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -26,6 +26,7 @@
 #include <linux/omap-dma.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
+#include <linux/mmc/mmc.h>
 #include <linux/clk.h>
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
@@ -130,7 +131,6 @@ struct mmc_omap_host {
         u32                     dma_rx_burst;
         struct dma_chan         *dma_tx;
         u32                     dma_tx_burst;
-        struct resource         *mem_res;
         void __iomem            *virt_base;
         unsigned int            phys_base;
         int                     irq;
@@ -153,7 +153,6 @@ struct mmc_omap_host {
         u32                     total_bytes_left;
 
         unsigned                features;
-        unsigned                use_dma:1;
         unsigned                brs_received:1, dma_done:1;
         unsigned                dma_in_use:1;
         spinlock_t              dma_lock;
@@ -338,6 +337,7 @@ mmc_omap_start_command(struct mmc_omap_host *host, struct mmc_command *cmd)
         u32 cmdreg;
         u32 resptype;
         u32 cmdtype;
+        u16 irq_mask;
 
         host->cmd = cmd;
 
@@ -390,12 +390,14 @@ mmc_omap_start_command(struct mmc_omap_host *host, struct mmc_command *cmd)
         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,
-                       OMAP_MMC_STAT_A_EMPTY    | OMAP_MMC_STAT_A_FULL    |
-                       OMAP_MMC_STAT_CMD_CRC    | OMAP_MMC_STAT_CMD_TOUT  |
-                       OMAP_MMC_STAT_DATA_CRC   | OMAP_MMC_STAT_DATA_TOUT |
-                       OMAP_MMC_STAT_END_OF_CMD | OMAP_MMC_STAT_CARD_ERR  |
-                       OMAP_MMC_STAT_END_OF_DATA);
+        irq_mask = OMAP_MMC_STAT_A_EMPTY    | OMAP_MMC_STAT_A_FULL    |
+                   OMAP_MMC_STAT_CMD_CRC    | OMAP_MMC_STAT_CMD_TOUT  |
+                   OMAP_MMC_STAT_DATA_CRC   | OMAP_MMC_STAT_DATA_TOUT |
+                   OMAP_MMC_STAT_END_OF_CMD | OMAP_MMC_STAT_CARD_ERR  |
+                   OMAP_MMC_STAT_END_OF_DATA;
+        if (cmd->opcode == MMC_ERASE)
+                irq_mask &= ~OMAP_MMC_STAT_DATA_TOUT;
+        OMAP_MMC_WRITE(host, IE, irq_mask);
         OMAP_MMC_WRITE(host, CMD, cmdreg);
 }
 
@@ -945,7 +947,7 @@ static void
 mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)
 {
         struct mmc_data *data = req->data;
-        int i, use_dma, block_size;
+        int i, use_dma = 1, block_size;
         unsigned sg_len;
 
         host->data = data;
@@ -970,13 +972,10 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req)
         sg_len = (data->blocks == 1) ? 1 : data->sg_len;
 
         /* Only do DMA for entire blocks */
-        use_dma = host->use_dma;
-        if (use_dma) {
-                for (i = 0; i < sg_len; i++) {
-                        if ((data->sg[i].length % block_size) != 0) {
-                                use_dma = 0;
-                                break;
-                        }
+        for (i = 0; i < sg_len; i++) {
+                if ((data->sg[i].length % block_size) != 0) {
+                        use_dma = 0;
+                        break;
                 }
         }
 
@@ -1239,7 +1238,7 @@ static int mmc_omap_new_slot(struct mmc_omap_host *host, int id)
 
         mmc->caps = 0;
         if (host->pdata->slots[id].wires >= 4)
-                mmc->caps |= MMC_CAP_4_BIT_DATA;
+                mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_ERASE;
 
         mmc->ops = &mmc_omap_ops;
         mmc->f_min = 400000;
@@ -1262,6 +1261,13 @@ static int mmc_omap_new_slot(struct mmc_omap_host *host, int id)
         mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
         mmc->max_seg_size = mmc->max_req_size;
 
+        if (slot->pdata->get_cover_state != NULL) {
+                setup_timer(&slot->cover_timer, mmc_omap_cover_timer,
+                            (unsigned long)slot);
+                tasklet_init(&slot->cover_tasklet, mmc_omap_cover_handler,
+                             (unsigned long)slot);
+        }
+
         r = mmc_add_host(mmc);
         if (r < 0)
                 goto err_remove_host;
@@ -1278,11 +1284,6 @@ static int mmc_omap_new_slot(struct mmc_omap_host *host, int id)
                                         &dev_attr_cover_switch);
                 if (r < 0)
                         goto err_remove_slot_name;
-
-                setup_timer(&slot->cover_timer, mmc_omap_cover_timer,
-                            (unsigned long)slot);
-                tasklet_init(&slot->cover_tasklet, mmc_omap_cover_handler,
-                             (unsigned long)slot);
                 tasklet_schedule(&slot->cover_tasklet);
         }
 
@@ -1333,21 +1334,19 @@ static int mmc_omap_probe(struct platform_device *pdev)
                 return -EPROBE_DEFER;
         }
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        host = devm_kzalloc(&pdev->dev, sizeof(struct mmc_omap_host),
+                            GFP_KERNEL);
+        if (host == NULL)
+                return -ENOMEM;
+
         irq = platform_get_irq(pdev, 0);
-        if (res == NULL || irq < 0)
+        if (irq < 0)
                 return -ENXIO;
 
-        res = request_mem_region(res->start, resource_size(res),
-                                 pdev->name);
-        if (res == NULL)
-                return -EBUSY;
-
-        host = kzalloc(sizeof(struct mmc_omap_host), GFP_KERNEL);
-        if (host == NULL) {
-                ret = -ENOMEM;
-                goto err_free_mem_region;
-        }
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        host->virt_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(host->virt_base))
+                return PTR_ERR(host->virt_base);
 
         INIT_WORK(&host->slot_release_work, mmc_omap_slot_release_work);
         INIT_WORK(&host->send_stop_work, mmc_omap_send_stop_work);
@@ -1369,20 +1368,11 @@ static int mmc_omap_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, host);
 
         host->id = pdev->id;
-        host->mem_res = res;
-        host->irq = irq;
-        host->use_dma = 1;
         host->irq = irq;
-        host->phys_base = host->mem_res->start;
-        host->virt_base = ioremap(res->start, resource_size(res));
-        if (!host->virt_base)
-                goto err_ioremap;
-
+        host->phys_base = res->start;
         host->iclk = clk_get(&pdev->dev, "ick");
-        if (IS_ERR(host->iclk)) {
-                ret = PTR_ERR(host->iclk);
-                goto err_free_mmc_host;
-        }
+        if (IS_ERR(host->iclk))
+                return PTR_ERR(host->iclk);
         clk_enable(host->iclk);
 
         host->fclk = clk_get(&pdev->dev, "fck");
@@ -1460,12 +1450,6 @@ err_free_dma:
 err_free_iclk:
         clk_disable(host->iclk);
         clk_put(host->iclk);
-err_free_mmc_host:
-        iounmap(host->virt_base);
-err_ioremap:
-        kfree(host);
-err_free_mem_region:
-        release_mem_region(res->start, resource_size(res));
         return ret;
 }
 
@@ -1493,13 +1477,8 @@ static int mmc_omap_remove(struct platform_device *pdev)
         if (host->dma_rx)
                 dma_release_channel(host->dma_rx);
 
-        iounmap(host->virt_base);
-        release_mem_region(pdev->resource[0].start,
-                           pdev->resource[0].end - pdev->resource[0].start + 1);
         destroy_workqueue(host->mmc_omap_wq);
 
-        kfree(host);
-
         return 0;
 }