aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mmc
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2012-06-20 02:28:43 -0400
committerChris Ball <cjb@laptop.org>2012-07-21 00:02:08 -0400
commite137788dd115dd9d21759a768dba5fff9685e587 (patch)
tree93c2bcea03d7e8799db1e575530cdfc4b534a932 /include/linux/mmc
parent6de707f200f73af7a58b58b3a5b956cff7b6e228 (diff)
mmc: add a function to get regulators, supplying card's power
Add a function to get regulators, supplying card's Vdd and Vccq on a specific host. If a Vdd supplying regulator is found, the function checks, whether a valid OCR mask can be obtained from it. The Vccq regulator is optional. A failure to get it is not fatal. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Reviwed-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'include/linux/mmc')
-rw-r--r--include/linux/mmc/host.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 0707d228d7f1..9deb725799e7 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -155,6 +155,13 @@ struct mmc_hotplug {
155 void *handler_priv; 155 void *handler_priv;
156}; 156};
157 157
158struct regulator;
159
160struct mmc_supply {
161 struct regulator *vmmc; /* Card power supply */
162 struct regulator *vqmmc; /* Optional Vccq supply */
163};
164
158struct mmc_host { 165struct mmc_host {
159 struct device *parent; 166 struct device *parent;
160 struct device class_dev; 167 struct device class_dev;
@@ -309,6 +316,7 @@ struct mmc_host {
309#ifdef CONFIG_REGULATOR 316#ifdef CONFIG_REGULATOR
310 bool regulator_enabled; /* regulator state */ 317 bool regulator_enabled; /* regulator state */
311#endif 318#endif
319 struct mmc_supply supply;
312 320
313 struct dentry *debugfs_root; 321 struct dentry *debugfs_root;
314 322
@@ -357,13 +365,12 @@ static inline void mmc_signal_sdio_irq(struct mmc_host *host)
357 wake_up_process(host->sdio_irq_thread); 365 wake_up_process(host->sdio_irq_thread);
358} 366}
359 367
360struct regulator;
361
362#ifdef CONFIG_REGULATOR 368#ifdef CONFIG_REGULATOR
363int mmc_regulator_get_ocrmask(struct regulator *supply); 369int mmc_regulator_get_ocrmask(struct regulator *supply);
364int mmc_regulator_set_ocr(struct mmc_host *mmc, 370int mmc_regulator_set_ocr(struct mmc_host *mmc,
365 struct regulator *supply, 371 struct regulator *supply,
366 unsigned short vdd_bit); 372 unsigned short vdd_bit);
373int mmc_regulator_get_supply(struct mmc_host *mmc);
367#else 374#else
368static inline int mmc_regulator_get_ocrmask(struct regulator *supply) 375static inline int mmc_regulator_get_ocrmask(struct regulator *supply)
369{ 376{
@@ -376,6 +383,11 @@ static inline int mmc_regulator_set_ocr(struct mmc_host *mmc,
376{ 383{
377 return 0; 384 return 0;
378} 385}
386
387static inline int mmc_regulator_get_supply(struct mmc_host *mmc)
388{
389 return 0;
390}
379#endif 391#endif
380 392
381int mmc_card_awake(struct mmc_host *host); 393int mmc_card_awake(struct mmc_host *host);