Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe16161f authored by Ritesh Harjani's avatar Ritesh Harjani Committed by Gerrit - the friendly Code Review server
Browse files

mmc: sdhci-msm: Add checks to know if card supports strobe 



This patch adds checks in msm host driver to check if card
also supports enhanced strobe before changing strobe specific
host configuration.

Change-Id: Iab4833e80600c4ad89b16c76b52e917f885eea0e
Signed-off-by: default avatarRitesh Harjani <riteshh@codeaurora.org>
parent a17bde16

drivers/mmc/host/sdhci-msm.c

+10 −7
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ static int sdhci_msm_cm_dll_sdc4_calibration(struct sdhci_host *host) 
		writel_relaxed(ddr_config, host->ioaddr + CORE_DDR_CONFIG);

	}



	if (msm_host->enhanced_strobe)

	if (msm_host->enhanced_strobe && mmc_card_strobe(msm_host->mmc->card))

		writel_relaxed((readl_relaxed(host->ioaddr + CORE_DDR_200_CFG)

				| CORE_CMDIN_RCLK_EN),

				host->ioaddr + CORE_DDR_200_CFG);
@@ -835,8 +835,8 @@ static int sdhci_msm_enhanced_strobe(struct sdhci_host *host) 


	pr_debug("%s: Enter %s\n", mmc_hostname(host->mmc), __func__);



	if (!msm_host->enhanced_strobe) {

		pr_debug("%s: host does not support hs400 enhanced strobe\n",

	if (!msm_host->enhanced_strobe || !mmc_card_strobe(mmc->card)) {

		pr_debug("%s: host/card does not support hs400 enhanced strobe\n",

				mmc_hostname(mmc));

		return -EINVAL;

	}
@@ -2670,7 +2670,9 @@ static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock) 
		 * Select HS400 mode using the HC_SELECT_IN from VENDOR SPEC

		 * register

		 */

		if ((msm_host->tuning_done || msm_host->enhanced_strobe) &&

		if ((msm_host->tuning_done ||

				(mmc_card_strobe(msm_host->mmc->card) &&

				 msm_host->enhanced_strobe)) &&

				!msm_host->calibration_done) {

			/*

			 * Write 0x6 to HC_SELECT_IN and 1 to HC_SELECT_IN_EN
@@ -2892,8 +2894,9 @@ static void sdhci_msm_enhanced_strobe_mask(struct sdhci_host *host, bool set) 
	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_msm_host *msm_host = pltfm_host->priv;



	if (!msm_host->enhanced_strobe) {

		pr_debug("%s: host does not support hs400 enhanced strobe\n",

	if (!msm_host->enhanced_strobe ||

			!mmc_card_strobe(msm_host->mmc->card)) {

		pr_debug("%s: host/card does not support hs400 enhanced strobe\n",

				mmc_hostname(host->mmc));

		return;

	}