| Message ID | 1376271546-25085-4-git-send-email-Haijun.Zhang@freescale.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Mon, Aug 12, 2013 at 09:39:06AM +0800, Haijun Zhang wrote: > 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>
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index a78bd4f..57541e0 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) diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index e3c6a74..3e781b8 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 */
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> --- changes for V3: - changed the type of mask drivers/mmc/host/sdhci.c | 3 +++ include/linux/mmc/sdhci.h | 1 + 2 files changed, 4 insertions(+)