1 files changed, 79 insertions, 46 deletions

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 4526d2791f29..dedf3dab8a3b 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -118,7 +118,7 @@
 
 #define MMC_TIMEOUT_MS          20
 #define OMAP_MMC_MASTER_CLOCK   96000000
-#define DRIVER_NAME             "mmci-omap-hs"
+#define DRIVER_NAME             "omap_hsmmc"
 
 /* Timeouts for entering power saving states on inactivity, msec */
 #define OMAP_MMC_DISABLED_TIMEOUT       100
@@ -250,9 +250,9 @@ static int omap_hsmmc_1_set_power(struct device *dev, int slot, int power_on,
                 mmc_slot(host).before_set_reg(dev, slot, power_on, vdd);
 
         if (power_on)
-                ret = mmc_regulator_set_ocr(host->vcc, vdd);
+                ret = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd);
         else
-                ret = mmc_regulator_set_ocr(host->vcc, 0);
+                ret = mmc_regulator_set_ocr(host->mmc, host->vcc, 0);
 
         if (mmc_slot(host).after_set_reg)
                 mmc_slot(host).after_set_reg(dev, slot, power_on, vdd);
@@ -260,7 +260,7 @@ static int omap_hsmmc_1_set_power(struct device *dev, int slot, int power_on,
         return ret;
 }
 
-static int omap_hsmmc_23_set_power(struct device *dev, int slot, int power_on,
+static int omap_hsmmc_235_set_power(struct device *dev, int slot, int power_on,
                                    int vdd)
 {
         struct omap_hsmmc_host *host =
@@ -291,18 +291,23 @@ static int omap_hsmmc_23_set_power(struct device *dev, int slot, int power_on,
          * chips/cards need an interface voltage rail too.
          */
         if (power_on) {
-                ret = mmc_regulator_set_ocr(host->vcc, vdd);
+                ret = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd);
                 /* Enable interface voltage rail, if needed */
                 if (ret == 0 && host->vcc_aux) {
                         ret = regulator_enable(host->vcc_aux);
                         if (ret < 0)
-                                ret = mmc_regulator_set_ocr(host->vcc, 0);
+                                ret = mmc_regulator_set_ocr(host->mmc,
+                                                        host->vcc, 0);
                 }
         } else {
+                /* Shut down the rail */
                 if (host->vcc_aux)
                         ret = regulator_disable(host->vcc_aux);
-                if (ret == 0)
-                        ret = mmc_regulator_set_ocr(host->vcc, 0);
+                if (!ret) {
+                        /* Then proceed to shut down the local regulator */
+                        ret = mmc_regulator_set_ocr(host->mmc,
+                                                host->vcc, 0);
+                }
         }
 
         if (mmc_slot(host).after_set_reg)
@@ -311,6 +316,12 @@ static int omap_hsmmc_23_set_power(struct device *dev, int slot, int power_on,
         return ret;
 }
 
+static int omap_hsmmc_4_set_power(struct device *dev, int slot, int power_on,
+                                        int vdd)
+{
+        return 0;
+}
+
 static int omap_hsmmc_1_set_sleep(struct device *dev, int slot, int sleep,
                                   int vdd, int cardsleep)
 {
@@ -321,7 +332,7 @@ static int omap_hsmmc_1_set_sleep(struct device *dev, int slot, int sleep,
         return regulator_set_mode(host->vcc, mode);
 }
 
-static int omap_hsmmc_23_set_sleep(struct device *dev, int slot, int sleep,
+static int omap_hsmmc_235_set_sleep(struct device *dev, int slot, int sleep,
                                    int vdd, int cardsleep)
 {
         struct omap_hsmmc_host *host =
@@ -343,9 +354,9 @@ static int omap_hsmmc_23_set_sleep(struct device *dev, int slot, int sleep,
         if (cardsleep) {
                 /* VCC can be turned off if card is asleep */
                 if (sleep)
-                        err = mmc_regulator_set_ocr(host->vcc, 0);
+                        err = mmc_regulator_set_ocr(host->mmc, host->vcc, 0);
                 else
-                        err = mmc_regulator_set_ocr(host->vcc, vdd);
+                        err = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd);
         } else
                 err = regulator_set_mode(host->vcc, mode);
         if (err)
@@ -360,10 +371,17 @@ static int omap_hsmmc_23_set_sleep(struct device *dev, int slot, int sleep,
                 return regulator_enable(host->vcc_aux);
 }
 
+static int omap_hsmmc_4_set_sleep(struct device *dev, int slot, int sleep,
+                                        int vdd, int cardsleep)
+{
+        return 0;
+}
+
 static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
 {
         struct regulator *reg;
         int ret = 0;
+        int ocr_value = 0;
 
         switch (host->id) {
         case OMAP_MMC1_DEVID:
@@ -373,10 +391,14 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
                 break;
         case OMAP_MMC2_DEVID:
         case OMAP_MMC3_DEVID:
+        case OMAP_MMC5_DEVID:
                 /* Off-chip level shifting, or none */
-                mmc_slot(host).set_power = omap_hsmmc_23_set_power;
-                mmc_slot(host).set_sleep = omap_hsmmc_23_set_sleep;
+                mmc_slot(host).set_power = omap_hsmmc_235_set_power;
+                mmc_slot(host).set_sleep = omap_hsmmc_235_set_sleep;
                 break;
+        case OMAP_MMC4_DEVID:
+                mmc_slot(host).set_power = omap_hsmmc_4_set_power;
+                mmc_slot(host).set_sleep = omap_hsmmc_4_set_sleep;
         default:
                 pr_err("MMC%d configuration not supported!\n", host->id);
                 return -EINVAL;
@@ -396,12 +418,25 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
                 }
         } else {
                 host->vcc = reg;
-                mmc_slot(host).ocr_mask = mmc_regulator_get_ocrmask(reg);
+                ocr_value = mmc_regulator_get_ocrmask(reg);
+                if (!mmc_slot(host).ocr_mask) {
+                        mmc_slot(host).ocr_mask = ocr_value;
+                } else {
+                        if (!(mmc_slot(host).ocr_mask & ocr_value)) {
+                                pr_err("MMC%d ocrmask %x is not supported\n",
+                                        host->id, mmc_slot(host).ocr_mask);
+                                mmc_slot(host).ocr_mask = 0;
+                                return -EINVAL;
+                        }
+                }
 
                 /* Allow an aux regulator */
                 reg = regulator_get(host->dev, "vmmc_aux");
                 host->vcc_aux = IS_ERR(reg) ? NULL : reg;
 
+                /* For eMMC do not power off when not in sleep state */
+                if (mmc_slot(host).no_regulator_off_init)
+                        return 0;
                 /*
                 * UGLY HACK:  workaround regulator framework bugs.
                 * When the bootloader leaves a supply active, it's
@@ -466,8 +501,6 @@ static int omap_hsmmc_gpio_init(struct omap_mmc_platform_data *pdata)
         int ret;
 
         if (gpio_is_valid(pdata->slots[0].switch_pin)) {
-                pdata->suspend = omap_hsmmc_suspend_cdirq;
-                pdata->resume = omap_hsmmc_resume_cdirq;
                 if (pdata->slots[0].cover)
                         pdata->slots[0].get_cover_state =
                                         omap_hsmmc_get_cover_state;
@@ -928,7 +961,8 @@ static void omap_hsmmc_dma_cleanup(struct omap_hsmmc_host *host, int errno)
         spin_unlock(&host->irq_lock);
 
         if (host->use_dma && dma_ch != -1) {
-                dma_unmap_sg(mmc_dev(host->mmc), host->data->sg, host->dma_len,
+                dma_unmap_sg(mmc_dev(host->mmc), host->data->sg,
+                        host->data->sg_len,
                         omap_hsmmc_get_dma_dir(host, host->data));
                 omap_free_dma(dma_ch);
         }
@@ -982,6 +1016,17 @@ static inline void omap_hsmmc_reset_controller_fsm(struct omap_hsmmc_host *host,
         OMAP_HSMMC_WRITE(host->base, SYSCTL,
                          OMAP_HSMMC_READ(host->base, SYSCTL) | bit);
 
+        /*
+         * OMAP4 ES2 and greater has an updated reset logic.
+         * Monitor a 0->1 transition first
+         */
+        if (mmc_slot(host).features & HSMMC_HAS_UPDATED_RESET) {
+                while ((!(OMAP_HSMMC_READ(host->base, SYSCTL) & bit))
+                                        && (i++ < limit))
+                        cpu_relax();
+        }
+        i = 0;
+
         while ((OMAP_HSMMC_READ(host->base, SYSCTL) & bit) &&
                 (i++ < limit))
                 cpu_relax();
@@ -1301,7 +1346,7 @@ static void omap_hsmmc_dma_cb(int lch, u16 ch_status, void *cb_data)
                 return;
         }
 
-        dma_unmap_sg(mmc_dev(host->mmc), data->sg, host->dma_len,
+        dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
                 omap_hsmmc_get_dma_dir(host, data));
 
         req_in_progress = host->req_in_progress;
@@ -1529,7 +1574,7 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                 break;
         }
 
-        if (host->id == OMAP_MMC1_DEVID) {
+        if (host->pdata->controller_flags & OMAP_HSMMC_SUPPORTS_DUAL_VOLT) {
                 /* Only MMC1 can interface at 3V without some flavor
                  * of external transceiver; but they all handle 1.8V.
                  */
@@ -1621,7 +1666,7 @@ static void omap_hsmmc_conf_bus_power(struct omap_hsmmc_host *host)
         u32 hctl, capa, value;
 
         /* Only MMC1 supports 3.0V */
-        if (host->id == OMAP_MMC1_DEVID) {
+        if (host->pdata->controller_flags & OMAP_HSMMC_SUPPORTS_DUAL_VOLT) {
                 hctl = SDVS30;
                 capa = VS30 | VS18;
         } else {
@@ -2003,8 +2048,9 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
         if (res == NULL || irq < 0)
                 return -ENXIO;
 
-        res = request_mem_region(res->start, res->end - res->start + 1,
-                                                        pdev->name);
+        res->start += pdata->reg_offset;
+        res->end += pdata->reg_offset;
+        res = request_mem_region(res->start, resource_size(res), pdev->name);
         if (res == NULL)
                 return -EBUSY;
 
@@ -2073,14 +2119,14 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
         /* we start off in DISABLED state */
         host->dpm_state = DISABLED;
 
-        if (mmc_host_enable(host->mmc) != 0) {
+        if (clk_enable(host->iclk) != 0) {
                 clk_put(host->iclk);
                 clk_put(host->fclk);
                 goto err1;
         }
 
-        if (clk_enable(host->iclk) != 0) {
-                mmc_host_disable(host->mmc);
+        if (mmc_host_enable(host->mmc) != 0) {
+                clk_disable(host->iclk);
                 clk_put(host->iclk);
                 clk_put(host->fclk);
                 goto err1;
@@ -2105,8 +2151,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
 
         /* Since we do only SG emulation, we can have as many segs
          * as we want. */
-        mmc->max_phys_segs = 1024;
-        mmc->max_hw_segs = 1024;
+        mmc->max_segs = 1024;
 
         mmc->max_blk_size = 512;       /* Block Length at max can be 1024 */
         mmc->max_blk_count = 0xFFFF;    /* No. of Blocks is 16 bits */
@@ -2116,23 +2161,9 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
         mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
                      MMC_CAP_WAIT_WHILE_BUSY | MMC_CAP_ERASE;
 
-        switch (mmc_slot(host).wires) {
-        case 8:
-                mmc->caps |= MMC_CAP_8_BIT_DATA;
-                /* Fall through */
-        case 4:
+        mmc->caps |= mmc_slot(host).caps;
+        if (mmc->caps & MMC_CAP_8_BIT_DATA)
                 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;
@@ -2203,6 +2234,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
                                 "Unable to grab MMC CD IRQ\n");
                         goto err_irq_cd;
                 }
+                pdata->suspend = omap_hsmmc_suspend_cdirq;
+                pdata->resume = omap_hsmmc_resume_cdirq;
         }
 
         omap_hsmmc_disable_irq(host);
@@ -2256,7 +2289,7 @@ err1:
 err_alloc:
         omap_hsmmc_gpio_free(pdata);
 err:
-        release_mem_region(res->start, res->end - res->start + 1);
+        release_mem_region(res->start, resource_size(res));
         return ret;
 }
 
@@ -2275,7 +2308,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
                 free_irq(host->irq, host);
                 if (mmc_slot(host).card_detect_irq)
                         free_irq(mmc_slot(host).card_detect_irq, host);
-                flush_scheduled_work();
+                flush_work_sync(&host->mmc_carddetect_work);
 
                 mmc_host_disable(host->mmc);
                 clk_disable(host->iclk);
@@ -2293,7 +2326,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res)
-                release_mem_region(res->start, res->end - res->start + 1);
+                release_mem_region(res->start, resource_size(res));
         platform_set_drvdata(pdev, NULL);
 
         return 0;