diff options
| author | Haijun Zhang <Haijun.Zhang@freescale.com> | 2013-08-26 03:19:23 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-08-26 17:32:07 +0200 |
| commit | c0b887b66c95fe5abaac071b8332b8c21113d84b (patch) | |
| tree | 0d4701ea0fcb12b1c0be7712098ab916f4f2b999 /drivers/mmc | |
| parent | mmc: core: parse voltage from device-tree (diff) | |
| download | linux-c0b887b66c95fe5abaac071b8332b8c21113d84b.tar.xz 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 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 32db0efa2f2c..b4d7f27d966b 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3119,6 +3119,9 @@ int sdhci_add_host(struct sdhci_host *host) SDHCI_MAX_CURRENT_MULTIPLIER; } + if (host->ocr_mask) + ocr_avail = host->ocr_mask; + mmc->ocr_avail = ocr_avail; mmc->ocr_avail_sdio = ocr_avail; if (host->ocr_avail_sdio) |