Commit c0b887b6 authored by Haijun Zhang's avatar Haijun Zhang Committed by Chris Ball
Browse files

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: default avatarHaijun Zhang <haijun.zhang@freescale.com>
Reviewed-by: default avatarAnton Vorontsov <anton@enomsg.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 6e9e318b

drivers/mmc/host/sdhci.c

+3 −0
Original line number Diff line number Diff line
@@ -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)

include/linux/mmc/sdhci.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE