diff options
| author | Alberto Panizzo <maramaopercheseimorto@gmail.com> | 2010-11-09 11:35:37 +0100 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-01-08 21:49:11 -0500 |
| commit | d078d24242ff6c36338991627f9c63b2d48a6eee (patch) | |
| tree | b90c964aa6bb3b999abbe4b2d4895246103bc90e /drivers/mmc | |
| parent | 74b66954ebfcef9bc26d9c377d32fbd46b4ddc32 (diff) | |
| download | op-kernel-dev-d078d24242ff6c36338991627f9c63b2d48a6eee.zip op-kernel-dev-d078d24242ff6c36338991627f9c63b2d48a6eee.tar.gz | |
mmc: mxcmmc: update the regulator support code to the latest API
This also fixes the build problem introduced by my previous patch
due to unhandled API changes introduced by commit:
99fc513101 (mmc: Move regulator handling closer to core)
Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/mxcmmc.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index 1a7f48c..2b9f7c8 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c @@ -150,7 +150,6 @@ static void mxcmci_set_clk_rate(struct mxcmci_host *host, unsigned int clk_ios); static inline void mxcmci_init_ocr(struct mxcmci_host *host) { -#ifdef CONFIG_REGULATOR host->vcc = regulator_get(mmc_dev(host->mmc), "vmmc"); if (IS_ERR(host->vcc)) { @@ -161,7 +160,7 @@ static inline void mxcmci_init_ocr(struct mxcmci_host *host) dev_warn(mmc_dev(host->mmc), "pdata->ocr_avail will not be used\n"); } -#endif + if (host->vcc == NULL) { /* fall-back to platform data */ if (host->pdata && host->pdata->ocr_avail) @@ -171,12 +170,17 @@ static inline void mxcmci_init_ocr(struct mxcmci_host *host) } } -static inline void mxcmci_set_power(struct mxcmci_host *host, unsigned int vdd) +static inline void mxcmci_set_power(struct mxcmci_host *host, + unsigned char power_mode, + unsigned int vdd) { -#ifdef CONFIG_REGULATOR - if (host->vcc) - mmc_regulator_set_ocr(host->vcc, vdd); -#endif + if (host->vcc) { + if (power_mode == MMC_POWER_UP) + mmc_regulator_set_ocr(host->mmc, host->vcc, vdd); + else if (power_mode == MMC_POWER_OFF) + mmc_regulator_set_ocr(host->mmc, host->vcc, 0); + } + if (host->pdata && host->pdata->setpower) host->pdata->setpower(mmc_dev(host->mmc), vdd); } @@ -716,7 +720,7 @@ static void mxcmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) host->cmdat &= ~CMD_DAT_CONT_BUS_WIDTH_4; if (host->power_mode != ios->power_mode) { - mxcmci_set_power(host, ios->vdd); + mxcmci_set_power(host, ios->power_mode, ios->vdd); host->power_mode = ios->power_mode; if (ios->power_mode == MMC_POWER_ON) |
