summaryrefslogtreecommitdiffstats
path: root/include/linux/mmc
diff options
context:
space:
mode:
authorHaijun Zhang2013-08-26 03:19:23 +0200
committerChris Ball2013-08-26 17:32:07 +0200
commitc0b887b66c95fe5abaac071b8332b8c21113d84b (patch)
tree0d4701ea0fcb12b1c0be7712098ab916f4f2b999 /include/linux/mmc
parentmmc: core: parse voltage from device-tree (diff)
downloadkernel-qcow2-linux-c0b887b66c95fe5abaac071b8332b8c21113d84b.tar.gz
kernel-qcow2-linux-c0b887b66c95fe5abaac071b8332b8c21113d84b.tar.xz
kernel-qcow2-linux-c0b887b66c95fe5abaac071b8332b8c21113d84b.zip
mmc: sdhci: get voltage from sdhc host
We use host->ocr_mask to hold the voltage get from device-tree node, In case host->ocr_mask was available, we use host->ocr_mask as the final available voltage can be used by MMC/SD/SDIO card. Signed-off-by: Haijun Zhang <haijun.zhang@freescale.com> Reviewed-by: Anton Vorontsov <anton@enomsg.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'include/linux/mmc')
-rw-r--r--include/linux/mmc/sdhci.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index e3c6a74d980a..3e781b8c0be7 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -171,6 +171,7 @@ struct sdhci_host {
unsigned int ocr_avail_sdio; /* OCR bit masks */
unsigned int ocr_avail_sd;
unsigned int ocr_avail_mmc;
+ u32 ocr_mask; /* available voltages */
wait_queue_head_t buf_ready_int; /* Waitqueue for Buffer Read Ready interrupt */
unsigned int tuning_done; /* Condition flag set when CMD19 succeeds */