Save and restore SDHCI interrupt mask during suspend/resume. Enables ARM Tegra2 board to suspend/resume.
Signed-off-by: Venkat Rao <[email protected]> Reviewed-by: Olof Johansson <[email protected]> Reviewed-by: Grant Grundler <[email protected]> --- drivers/mmc/host/sdhci.c | 5 +++++ include/linux/mmc/sdhci.h | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 3c6358f..68d2e36 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1654,6 +1654,8 @@ int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state) if (mmc->card && (mmc->card->type != MMC_TYPE_SDIO)) ret = mmc_suspend_host(host->mmc); + /* Save the original intmask to restore later */ + host->save_intmask = sdhci_readl(host, SDHCI_INT_ENABLE); sdhci_mask_irqs(host, SDHCI_INT_ALL_MASK); if (host->vmmc) @@ -1695,6 +1697,9 @@ int sdhci_resume_host(struct sdhci_host *host) sdhci_enable_card_detection(host); + /* Restore the original intmask */ + sdhci_unmask_irqs(host, host->save_intmask); + return ret; } diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index dfb2106..5b9f6db 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h @@ -141,6 +141,8 @@ struct sdhci_host { unsigned int caps; /* Alternative capabilities */ + unsigned int save_intmask; /* Store original intmask */ + unsigned long private[0] ____cacheline_aligned; }; #endif /* __SDHCI_H */ -- 1.7.2.3 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
