On 31 October 2014 13:22, Adrian Hunter <adrian.hunter@xxxxxxxxx> wrote:
> 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: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> ---
> drivers/mmc/host/sdhci.c | 13 +++++++------
> include/linux/mmc/host.h | 1 +
> 2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 7736a2c..91e888c 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -3110,16 +3110,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_CAPS2_1_2V) &&
> + (IS_ERR(mmc->supply.vqmmc) ||
> + !regulator_is_supported_voltage(mmc->supply.vqmmc, 1100000,
> + 1300000)))
> + mmc->caps2 &= ~MMC_CAPS2_1_2V;
> +
> if ((caps[1] & SDHCI_SUPPORT_DDR50) &&
> !(host->quirks2 & SDHCI_QUIRK2_BROKEN_DDR50))
> mmc->caps |= MMC_CAP_UHS_DDR50;
> diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
> index df0c153..e48c1bf 100644
> --- a/include/linux/mmc/host.h
> +++ b/include/linux/mmc/host.h
> @@ -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_CAPS2_1_2V (MMC_CAP2_HS200_1_2V_SDR | MMC_CAP2_HS400_1_2V)
Nitpick: Could you please rename "MMC_CAPS2_1_2V" to
"MMC_CAP2_HSx00_1_2V". I think that name will describe its use better.
> #define MMC_CAP2_SDIO_IRQ_NOTHREAD (1 << 17)
>
> mmc_pm_flag_t pm_caps; /* supported pm features */
> --
> 1.9.1
>
Kind regards
Uffe
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
