mmc: sdhci-esdhc-imx: restore pin state when resume back
authorHaibo Chen <haibo.chen@nxp.com>
Wed, 19 Feb 2020 08:25:56 +0000 (16:25 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Tue, 24 Mar 2020 13:35:41 +0000 (14:35 +0100)
In some low power mode, SoC will lose the pin state, so need to restore
the pin state when resume back.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Link: https://lore.kernel.org/r/1582100757-20683-8-git-send-email-haibo.chen@nxp.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-esdhc-imx.c

index 786305309eb06c7329afb2c5f5e4d598033f60a9..b38b9d7f0a0d6b41e3745c53e298c257079cd0da 100644 (file)
@@ -1731,7 +1731,11 @@ static int sdhci_esdhc_suspend(struct device *dev)
        if (host->tuning_mode != SDHCI_TUNING_MODE_3)
                mmc_retune_needed(host->mmc);
 
-       return sdhci_suspend_host(host);
+       ret = sdhci_suspend_host(host);
+       if (!ret)
+               return pinctrl_pm_select_sleep_state(dev);
+
+       return ret;
 }
 
 static int sdhci_esdhc_resume(struct device *dev)
@@ -1739,6 +1743,10 @@ static int sdhci_esdhc_resume(struct device *dev)
        struct sdhci_host *host = dev_get_drvdata(dev);
        int ret;
 
+       ret = pinctrl_pm_select_default_state(dev);
+       if (ret)
+               return ret;
+
        /* re-initialize hw state in case it's lost in low power mode */
        sdhci_esdhc_imx_hwinit(host);