diff options
| author | Tim Kryger <tim.kryger@gmail.com> | 2014-06-13 13:13:56 -0400 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-07-09 05:25:59 -0400 |
| commit | 3a48edc4bd68f841c07c7bc86358d2f02133f247 (patch) | |
| tree | 3e8b950042c06d5e13763e46498e10c93f6cd661 /include/linux | |
| parent | 2e42da59804aa57903393dca2d234561e6db41a0 (diff) | |
mmc: sdhci: Use mmc core regulator infrastucture
Switch the common SDHCI code over to use mmc_host's regulator pointers
and remove the ones in the sdhci_host structure. Additionally, use the
common mmc_regulator_get_supply function to get the regulators and set
the ocr_avail mask.
This change sets the ocr_avail directly based upon the voltage ranges
supported which ensures ocr_avail is set correctly while allowing the
use of regulators that can't provide exactly 1.8v, 3.0v, or 3.3v.
Signed-off-by: Tim Kryger <tim.kryger@gmail.com>
Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
Reviewed-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mmc/sdhci.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index 08abe9941884..09ebe57d5ce9 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h | |||
| @@ -104,9 +104,6 @@ struct sdhci_host { | |||
| 104 | 104 | ||
| 105 | const struct sdhci_ops *ops; /* Low level hw interface */ | 105 | const struct sdhci_ops *ops; /* Low level hw interface */ |
| 106 | 106 | ||
| 107 | struct regulator *vmmc; /* Power regulator (vmmc) */ | ||
| 108 | struct regulator *vqmmc; /* Signaling regulator (vccq) */ | ||
| 109 | |||
| 110 | /* Internal data */ | 107 | /* Internal data */ |
| 111 | struct mmc_host *mmc; /* MMC structure */ | 108 | struct mmc_host *mmc; /* MMC structure */ |
| 112 | u64 dma_mask; /* custom DMA mask */ | 109 | u64 dma_mask; /* custom DMA mask */ |
