evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mmc: sdhci-msm: Reenable cd gpio on system resume

Browse source 
In 3.18 kernel mmc_gpiod_request_cd_irq() is not called as part of
call to mmc_gpio_request_cd(). During probe this is taken care of
by calling mmc_gpiod_request_cd_irq() from mmc_start_host(), but if
mmc_gpio_request_cd() followed by a mmc_gpio_free_cd() is invoked
after mmc_start_host() (such as in system suspend/resume path) then
mmc_gpiod_request_cd_irq() needs to be called explicitly.

Instead of free/request the card detect irq, just disable/enable
the irq in system suspend/resume path.

CRs-fixed: 876453
Change-Id: I976cd5061c2a7d8321e48ee23a44acfd552a37fc
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
This commit is contained in:
Venkat Gopalakrishnan 2015-07-28 13:44:53 -07:00 • committed by Subhash Jadavani
parent e0ee5ff565
commit bdd297db78
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/mmc/host/sdhci-msm.c
View file

@ -3583,8 +3583,9 @@ static int sdhci_msm_suspend(struct device *dev)
int ret = 0; int ret = 0;
ktime_t start = ktime_get(); ktime_t start = ktime_get();
if (gpio_is_valid(msm_host->pdata->status_gpio)) if (gpio_is_valid(msm_host->pdata->status_gpio) &&
mmc_gpio_free_cd(msm_host->mmc); (msm_host->mmc->slot.cd_irq >= 0))
disable_irq(msm_host->mmc->slot.cd_irq);
if (pm_runtime_suspended(dev)) { if (pm_runtime_suspended(dev)) {
pr_debug("%s: %s: already runtime suspended\n", pr_debug("%s: %s: already runtime suspended\n",
@ -3606,13 +3607,10 @@ static int sdhci_msm_resume(struct device *dev)
int ret = 0; int ret = 0;
ktime_t start = ktime_get(); ktime_t start = ktime_get();
if (gpio_is_valid(msm_host->pdata->status_gpio)) { if (gpio_is_valid(msm_host->pdata->status_gpio) &&
ret = mmc_gpio_request_cd(msm_host->mmc, (msm_host->mmc->slot.cd_irq >= 0))
msm_host->pdata->status_gpio, 0); enable_irq(msm_host->mmc->slot.cd_irq);
if (ret)
pr_err("%s: %s: Failed to request card detection IRQ %d\n",
mmc_hostname(host->mmc), __func__, ret);
}
if (pm_runtime_suspended(dev)) { if (pm_runtime_suspended(dev)) {
pr_debug("%s: %s: runtime suspended, defer system resume\n", pr_debug("%s: %s: runtime suspended, defer system resume\n",
mmc_hostname(host->mmc), __func__); mmc_hostname(host->mmc), __func__);