iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: sdhci-msm: Remove platform_execute_tuning from sdhci_msm_ops

Browse Source 
platform_execute_tuning should not really exist as it does not
do anything useful.

So remove this ops and directly plug sdhci_msm_execute_tuning
with mmc_host_ops.

Also in case of HS400 tuning clear SDHCI_HS400_TUNING flag once
HS400 related mode selection is done.

Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Ritesh Harjani
2017-01-24 14:20:26 +05:30
committed by Ulf Hansson
parent fb00f196fc
commit 4436c53599
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mmc/host/sdhci-msm.c
View File

@ -827,12 +827,12 @@ out:
return ret; return ret;
} }
static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode) static int sdhci_msm_execute_tuning(struct mmc_host *mmc, u32 opcode)
{ {
struct sdhci_host *host = mmc_priv(mmc);
int tuning_seq_cnt = 3; int tuning_seq_cnt = 3;
u8 phase, tuned_phases[16], tuned_phase_cnt = 0; u8 phase, tuned_phases[16], tuned_phase_cnt = 0;
int rc; int rc;
struct mmc_host *mmc = host->mmc;
struct mmc_ios ios = host->mmc->ios; struct mmc_ios ios = host->mmc->ios;
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host); struct sdhci_msm_host *msm_host = sdhci_pltfm_priv(pltfm_host);
@ -855,6 +855,7 @@ static int sdhci_msm_execute_tuning(struct sdhci_host *host, u32 opcode)
if (host->flags & SDHCI_HS400_TUNING) { if (host->flags & SDHCI_HS400_TUNING) {
sdhci_msm_hc_select_mode(host); sdhci_msm_hc_select_mode(host);
msm_set_clock_rate_for_bus_mode(host, ios.clock); msm_set_clock_rate_for_bus_mode(host, ios.clock);
host->flags &= ~SDHCI_HS400_TUNING;
} }
retry: retry:
@ -1119,7 +1120,6 @@ static const struct of_device_id sdhci_msm_dt_match[] = {
MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match); MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);
static const struct sdhci_ops sdhci_msm_ops = { static const struct sdhci_ops sdhci_msm_ops = {
.platform_execute_tuning = sdhci_msm_execute_tuning,
.reset = sdhci_reset, .reset = sdhci_reset,
.set_clock = sdhci_msm_set_clock, .set_clock = sdhci_msm_set_clock,
.get_min_clock = sdhci_msm_get_min_clock, .get_min_clock = sdhci_msm_get_min_clock,
@ -1294,6 +1294,7 @@ static int sdhci_msm_probe(struct platform_device *pdev)
MSM_MMC_AUTOSUSPEND_DELAY_MS); MSM_MMC_AUTOSUSPEND_DELAY_MS);
pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_use_autosuspend(&pdev->dev);
host->mmc_host_ops.execute_tuning = sdhci_msm_execute_tuning;
ret = sdhci_add_host(host); ret = sdhci_add_host(host);
if (ret) if (ret)
goto pm_runtime_disable; goto pm_runtime_disable;