diff options
| author | Pavan Kunapuli <pkunapuli@nvidia.com> | 2014-03-19 16:05:05 +0530 |
|---|---|---|
| committer | Pavan Kunapuli <pkunapuli@nvidia.com> | 2014-03-28 06:50:34 -0700 |
| commit | d2779d822c5613ad4c055e19f4e58d2e7b2e58c0 (patch) | |
| tree | 54a9fe654dc53bda89f042ce8b0f68064ab28893 /drivers/mmc | |
| parent | e6058d212505b786b6bdde5c8e4cb2b882911c58 (diff) | |
mmc: sdhci: Send signal voltage info to auto cal code
Send signal voltage value to auto calibration code
Bug 1423429
Reviewed-on: http://git-master/r/383824
(cherry picked from commit 7eecf6e511c6462625781ef70815076826fbec92)
Change-Id: I87b633425ac30f167df0637b743f7962821fc240
Signed-off-by: Pavan Kunapuli <pkunapuli@nvidia.com>
Reviewed-on: http://git-master/r/389576
Reviewed-by: Venu Byravarasu <vbyravarasu@nvidia.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 6 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 9a8c3d8596ff..d1c132633663 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2183,7 +2183,8 @@ static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc, err = sdhci_do_start_signal_voltage_switch(host, ios); /* Do any post voltage switch platform specific configuration */ if (host->ops->switch_signal_voltage_exit) - host->ops->switch_signal_voltage_exit(host); + host->ops->switch_signal_voltage_exit(host, + ios->signal_voltage); sdhci_runtime_pm_put(host); return err; } @@ -3237,7 +3238,8 @@ int sdhci_runtime_resume_host(struct sdhci_host *host) sdhci_do_start_signal_voltage_switch(host, &host->mmc->ios); /* Do any post voltage switch platform specific configuration */ if (host->ops->switch_signal_voltage_exit) - host->ops->switch_signal_voltage_exit(host); + host->ops->switch_signal_voltage_exit(host, + host->mmc->ios.signal_voltage); if ((host_flags & SDHCI_PV_ENABLED) && !(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN)) { spin_lock_irqsave(&host->lock, flags); diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 8f678eb2e734..dd3407e3ce01 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -370,7 +370,8 @@ struct sdhci_ops { struct mmc_ios *ios); int (*switch_signal_voltage)(struct sdhci_host *host, unsigned int signal_voltage); - void (*switch_signal_voltage_exit)(struct sdhci_host *host); + void (*switch_signal_voltage_exit)(struct sdhci_host *host, + unsigned char signal_voltage); int (*suspend)(struct sdhci_host *host); int (*resume)(struct sdhci_host *host); int (*execute_freq_tuning)(struct sdhci_host *sdhci, u32 opcode); |