From: Victor Gu <xigu@xxxxxxxxxxx> Currently the voltage switch callback function is only called in the 1.8V case. However, given the name this callback should be called in the 3.3V case too. It is needed for the Xenon controller. [gregory.clement@xxxxxxxxxxxxxxxxxx: split the initial commit and modify the log] Signed-off-by: Victor Gu <xigu@xxxxxxxxxxx> Signed-off-by: Marcin Wojtas <mw@xxxxxxxxxxxx> Signed-off-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxxxxxxxxx> --- drivers/mmc/host/sdhci.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index fd4e9a84f739..b07219426d39 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1749,6 +1749,10 @@ static int sdhci_start_signal_voltage_switch(struct mmc_host *mmc, /* Wait for 5ms */ usleep_range(5000, 5500); + /* Some controller need to do more when switching */ + if (host->ops->voltage_switch) + host->ops->voltage_switch(host); + /* 3.3V regulator output should be stable within 5 ms */ ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2); if (!(ctrl & SDHCI_CTRL_VDD_180)) -- 2.5.0 -- 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
