GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-31 03:21:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmc: fsl_esdhc: Gracefully fail on unsupported voltage switch

Browse source 
Unsupported voltage on voltage switch is not an error, do not
print error message in such a case. This happens e.g. if the
eMMC is already in 1V8 mode or when testing 1V2 mode operation
on systems which only do 3V3/1V8 switching.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
This commit is contained in:
Marek Vasut 2020-05-22 18:28:33 +02:00 • committed by Peng Fan
parent 406df85345
commit 50a17a69be
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/mmc/fsl_esdhc_imx.c
View file

@ -791,7 +791,7 @@ static int esdhc_set_voltage(struct mmc *mmc)
switch (mmc->signal_voltage) { switch (mmc->signal_voltage) {
case MMC_SIGNAL_VOLTAGE_330: case MMC_SIGNAL_VOLTAGE_330:
if (priv->vs18_enable) if (priv->vs18_enable)
return -EIO; return -ENOTSUPP;
#if CONFIG_IS_ENABLED(DM_REGULATOR) #if CONFIG_IS_ENABLED(DM_REGULATOR)
if (!IS_ERR_OR_NULL(priv->vqmmc_dev)) { if (!IS_ERR_OR_NULL(priv->vqmmc_dev)) {
ret = regulator_set_value(priv->vqmmc_dev, 3300000); ret = regulator_set_value(priv->vqmmc_dev, 3300000);
@ -972,7 +972,8 @@ static int esdhc_set_ios_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)
if (priv->signal_voltage != mmc->signal_voltage) { if (priv->signal_voltage != mmc->signal_voltage) {
ret = esdhc_set_voltage(mmc); ret = esdhc_set_voltage(mmc);
if (ret) { if (ret) {
printf("esdhc_set_voltage error %d\n", ret); if (ret != -ENOTSUPP)
printf("esdhc_set_voltage error %d\n", ret);
return ret; return ret;
} }
} }