diff options
| author | Ohad Ben-Cohen <ohad@wizery.com> | 2010-10-02 13:54:07 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2010-10-23 21:11:18 +0800 |
| commit | d3fe37b1a1d98f060279bfa32fcf5a134851a91a (patch) | |
| tree | ec12b9f05efdf9145f1d5f3a47976e586bef1b1b /drivers/mmc | |
| parent | 12ae637f081a7a05144af65802a7b492b9162660 (diff) | |
| download | kernel_samsung_aries-d3fe37b1a1d98f060279bfa32fcf5a134851a91a.zip kernel_samsung_aries-d3fe37b1a1d98f060279bfa32fcf5a134851a91a.tar.gz kernel_samsung_aries-d3fe37b1a1d98f060279bfa32fcf5a134851a91a.tar.bz2 | |
mmc: sdio: add power_restore support
Add a power_restore handler to the SDIO bus ops,
in order to support waking up SDIO cards that
were powered off by runtime pm.
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Tested-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/sdio.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 3be1571..f17e0e0 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -638,11 +638,29 @@ static int mmc_sdio_resume(struct mmc_host *host) return err; } +static int mmc_sdio_power_restore(struct mmc_host *host) +{ + int ret; + + BUG_ON(!host); + BUG_ON(!host->card); + + mmc_claim_host(host); + ret = mmc_sdio_init_card(host, host->ocr, host->card, + (host->pm_flags & MMC_PM_KEEP_POWER)); + if (!ret && host->sdio_irqs) + mmc_signal_sdio_irq(host); + mmc_release_host(host); + + return ret; +} + static const struct mmc_bus_ops mmc_sdio_ops = { .remove = mmc_sdio_remove, .detect = mmc_sdio_detect, .suspend = mmc_sdio_suspend, .resume = mmc_sdio_resume, + .power_restore = mmc_sdio_power_restore, }; |