Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (66 commits)
  mmc: add new sdhci-pxa driver for Marvell SoCs
  mmc: make number of mmcblk minors configurable
  mmc_spi: Recover from CRC errors for r/w operation over SPI.
  mmc: sdhci-pltfm: add -pltfm driver for imx35/51
  mmc: sdhci-of-esdhc: factor out common stuff
  mmc: sdhci_pltfm: pass more data on custom init call
  mmc: sdhci: introduce get_ro private write-protect hook
  mmc: sdhci-pltfm: move .h file into appropriate subdir
  mmc: sdhci-pltfm: Add structure for host-specific data
  mmc: fix cb710 kconfig dependency warning
  mmc: cb710: remove debugging printk (info duplicated from mmc-core)
  mmc: cb710: clear irq handler on init() error path
  mmc: cb710: remove unnecessary msleep()
  mmc: cb710: implement get_cd() callback
  mmc: cb710: partially demystify clock selection
  mmc: add a file to debugfs for changing host clock at runtime
  mmc: sdhci: allow for eMMC 74 clock generation by controller
  mmc: sdhci: highspeed: check for mmc as well as sd cards
  mmc: sdhci: Add Moorestown device support
  mmc: sdhci: Intel Medfield support
  ...

1 files changed, 14 insertions, 10 deletions

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 4693e62145a6..e865032a52eb 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -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);
@@ -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)
@@ -343,9 +348,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)
@@ -2130,8 +2135,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 */