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

Commit db9bd163 authored by Ritesh Harjani's avatar Ritesh Harjani Committed by Ulf Hansson
Browse files

mmc: sdhci-msm: Factor out sdhci_msm_hs400 



Factor out sdhci_msm_hs400 used for DLL calibration in HS400
modes. This function will be needed for enhanced_strobe as well.

Signed-off-by: default avatarRitesh Harjani <riteshh@codeaurora.org>
Tested-by: default avatarJeremy McNicoll <jeremymc@redhat.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 0fb8a3d4

drivers/mmc/host/sdhci-msm.c

+26 −6
Original line number Diff line number Diff line
@@ -884,6 +884,28 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) 
	return rc;

}



/*

 * sdhci_msm_hs400 - Calibrate the DLL for HS400 bus speed mode operation.

 * DLL operation is only needed for clock > 100MHz. For clock <= 100MHz

 * fixed feedback clock is used.

 */

static void sdhci_msm_hs400(struct sdhci_host *host, struct mmc_ios *ios)

{

	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);

	int ret;



	if (host->clock > CORE_FREQ_100MHZ &&

	    msm_host->tuning_done && !msm_host->calibration_done) {

		ret = sdhci_msm_hs400_dll_calibration(host);

		if (!ret)

			msm_host->calibration_done = true;

		else

			pr_err("%s: Failed to calibrate DLL for hs400 mode (%d)\n",

			       mmc_hostname(host->mmc), ret);

	}

}



static void sdhci_msm_set_uhs_signaling(struct sdhci_host *host,

					unsigned int uhs)

{
@@ -952,12 +974,10 @@ static void sdhci_msm_set_uhs_signaling(struct sdhci_host *host, 
	sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);



	spin_unlock_irq(&host->lock);

	/* CDCLP533 HW calibration is only required for HS400 mode*/

	if (host->clock > CORE_FREQ_100MHZ &&

	    msm_host->tuning_done && !msm_host->calibration_done &&

	    mmc->ios.timing == MMC_TIMING_MMC_HS400)

		if (!sdhci_msm_hs400_dll_calibration(host))

			msm_host->calibration_done = true;



	if (mmc->ios.timing == MMC_TIMING_MMC_HS400)

		sdhci_msm_hs400(host, &mmc->ios);



	spin_lock_irq(&host->lock);

}