On Wed, 27 May 2020 at 04:50, <haibo.chen@xxxxxxx> wrote: > > From: Haibo Chen <haibo.chen@xxxxxxx> > > When use the specific GPIO to detect the card insert/remove, we can > also add the GPIO as a wakeup source. When system suspend, insert or > remove the card can wakeup the system. > > Signed-off-by: Haibo Chen <haibo.chen@xxxxxxx> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/sdhci-esdhc-imx.c | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c > index 5398af4824c3..5a27511438c8 100644 > --- a/drivers/mmc/host/sdhci-esdhc-imx.c > +++ b/drivers/mmc/host/sdhci-esdhc-imx.c > @@ -1599,6 +1599,10 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) > if (esdhc_is_usdhc(imx_data)) { > host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN; > host->mmc->caps |= MMC_CAP_1_8V_DDR | MMC_CAP_3_3V_DDR; > + > + /* GPIO CD can be set as a wakeup source */ > + host->mmc->caps |= MMC_CAP_CD_WAKE; > + > if (!(imx_data->socdata->flags & ESDHC_FLAG_HS200)) > host->quirks2 |= SDHCI_QUIRK2_BROKEN_HS200; > > @@ -1734,8 +1738,14 @@ static int sdhci_esdhc_suspend(struct device *dev) > mmc_retune_needed(host->mmc); > > ret = sdhci_suspend_host(host); > - if (!ret) > - return pinctrl_pm_select_sleep_state(dev); > + if (ret) > + return ret; > + > + ret = pinctrl_pm_select_sleep_state(dev); > + if (ret) > + return ret; > + > + ret = mmc_gpio_set_cd_wake(host->mmc, true); > > return ret; > } > @@ -1759,6 +1769,9 @@ static int sdhci_esdhc_resume(struct device *dev) > if (host->mmc->caps2 & MMC_CAP2_CQE) > ret = cqhci_resume(host->mmc); > > + if (!ret) > + ret = mmc_gpio_set_cd_wake(host->mmc, false); > + > return ret; > } > #endif > -- > 2.17.1 >