Commit 549c0b18 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Clear also HS400 1.2V capability if 1.2V is not supported 



1.2V HS200 mode capability is cleared if there is not a voltage
regulator that supports 1.2V.  Do the same for 1.2V HS400 mode.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 4bb74313

drivers/mmc/host/sdhci.c

+7 −6
Original line number Diff line number Diff line
@@ -3115,16 +3115,17 @@ int sdhci_add_host(struct sdhci_host *host) 
		/* SD3.0: SDR104 is supported so (for eMMC) the caps2

		 * field can be promoted to support HS200.

		 */

		if (!(host->quirks2 & SDHCI_QUIRK2_BROKEN_HS200)) {

		if (!(host->quirks2 & SDHCI_QUIRK2_BROKEN_HS200))

			mmc->caps2 |= MMC_CAP2_HS200;

			if (IS_ERR(mmc->supply.vqmmc) ||

					!regulator_is_supported_voltage

					(mmc->supply.vqmmc, 1100000, 1300000))

				mmc->caps2 &= ~MMC_CAP2_HS200_1_2V_SDR;

		}

	} else if (caps[1] & SDHCI_SUPPORT_SDR50)

		mmc->caps |= MMC_CAP_UHS_SDR50;



	if ((mmc->caps2 & MMC_CAP2_HSX00_1_2V) &&

	    (IS_ERR(mmc->supply.vqmmc) ||

	     !regulator_is_supported_voltage(mmc->supply.vqmmc, 1100000,

					     1300000)))

		mmc->caps2 &= ~MMC_CAP2_HSX00_1_2V;



	if ((caps[1] & SDHCI_SUPPORT_DDR50) &&

		!(host->quirks2 & SDHCI_QUIRK2_BROKEN_DDR50))

		mmc->caps |= MMC_CAP_UHS_DDR50;

include/linux/mmc/host.h

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ struct mmc_host { 
#define MMC_CAP2_HS400_1_2V	(1 << 16)	/* Can support HS400 1.2V */

#define MMC_CAP2_HS400		(MMC_CAP2_HS400_1_8V | \

				 MMC_CAP2_HS400_1_2V)

#define MMC_CAP2_HSX00_1_2V	(MMC_CAP2_HS200_1_2V_SDR | MMC_CAP2_HS400_1_2V)

#define MMC_CAP2_SDIO_IRQ_NOTHREAD (1 << 17)



	mmc_pm_flag_t		pm_caps;	/* supported pm features */