|
@@ -3734,14 +3734,21 @@ int sdhci_setup_host(struct sdhci_host *host)
|
|
|
mmc_gpio_get_cd(host->mmc) < 0)
|
|
|
mmc->caps |= MMC_CAP_NEEDS_POLL;
|
|
|
|
|
|
- /* If vqmmc regulator and no 1.8V signalling, then there's no UHS */
|
|
|
if (!IS_ERR(mmc->supply.vqmmc)) {
|
|
|
ret = regulator_enable(mmc->supply.vqmmc);
|
|
|
+
|
|
|
+ /* If vqmmc provides no 1.8V signalling, then there's no UHS */
|
|
|
if (!regulator_is_supported_voltage(mmc->supply.vqmmc, 1700000,
|
|
|
1950000))
|
|
|
host->caps1 &= ~(SDHCI_SUPPORT_SDR104 |
|
|
|
SDHCI_SUPPORT_SDR50 |
|
|
|
SDHCI_SUPPORT_DDR50);
|
|
|
+
|
|
|
+ /* In eMMC case vqmmc might be a fixed 1.8V regulator */
|
|
|
+ if (!regulator_is_supported_voltage(mmc->supply.vqmmc, 2700000,
|
|
|
+ 3600000))
|
|
|
+ host->flags &= ~SDHCI_SIGNALING_330;
|
|
|
+
|
|
|
if (ret) {
|
|
|
pr_warn("%s: Failed to enable vqmmc regulator: %d\n",
|
|
|
mmc_hostname(mmc), ret);
|