Commit 0d7393b0 authored by Chaithrika U S's avatar Chaithrika U S Committed by Kevin Hilman

davinci: MMC: updates to suspend/resume implementation

Improve the suspend and resume callbacks in DaVinci MMC host controller driver.
Modify the reset status of the contorller and clock during suspend and resume.
Also migrate the power management callbacks from platform driver to dev_pm_ops
structure.

Tested on DA850/OMAP-L138 EVM.
Signed-off-by: default avatarChaithrika U S <chaithrika@ti.com>
Acked-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 2054a20f
...@@ -171,6 +171,7 @@ struct mmc_davinci_host { ...@@ -171,6 +171,7 @@ struct mmc_davinci_host {
#define DAVINCI_MMC_DATADIR_READ 1 #define DAVINCI_MMC_DATADIR_READ 1
#define DAVINCI_MMC_DATADIR_WRITE 2 #define DAVINCI_MMC_DATADIR_WRITE 2
unsigned char data_dir; unsigned char data_dir;
unsigned char suspended;
/* buffer is used during PIO of one scatterlist segment, and /* buffer is used during PIO of one scatterlist segment, and
* is updated along with buffer_bytes_left. bytes_left applies * is updated along with buffer_bytes_left. bytes_left applies
...@@ -1332,32 +1333,66 @@ static int __exit davinci_mmcsd_remove(struct platform_device *pdev) ...@@ -1332,32 +1333,66 @@ static int __exit davinci_mmcsd_remove(struct platform_device *pdev)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int davinci_mmcsd_suspend(struct platform_device *pdev, pm_message_t msg) static int davinci_mmcsd_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev);
struct mmc_davinci_host *host = platform_get_drvdata(pdev); struct mmc_davinci_host *host = platform_get_drvdata(pdev);
struct pm_message msg = { PM_EVENT_SUSPEND };
int ret;
return mmc_suspend_host(host->mmc, msg); mmc_host_enable(host->mmc);
ret = mmc_suspend_host(host->mmc, msg);
if (!ret) {
writel(0, host->base + DAVINCI_MMCIM);
mmc_davinci_reset_ctrl(host, 1);
mmc_host_disable(host->mmc);
clk_disable(host->clk);
host->suspended = 1;
} else {
host->suspended = 0;
mmc_host_disable(host->mmc);
}
return ret;
} }
static int davinci_mmcsd_resume(struct platform_device *pdev) static int davinci_mmcsd_resume(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev);
struct mmc_davinci_host *host = platform_get_drvdata(pdev); struct mmc_davinci_host *host = platform_get_drvdata(pdev);
int ret;
if (!host->suspended)
return 0;
clk_enable(host->clk);
mmc_host_enable(host->mmc);
return mmc_resume_host(host->mmc); mmc_davinci_reset_ctrl(host, 0);
ret = mmc_resume_host(host->mmc);
if (!ret)
host->suspended = 0;
return ret;
} }
static struct dev_pm_ops davinci_mmcsd_pm = {
.suspend = davinci_mmcsd_suspend,
.resume = davinci_mmcsd_resume,
};
#define davinci_mmcsd_pm_ops (&davinci_mmcsd_pm)
#else #else
#define davinci_mmcsd_suspend NULL #define davinci_mmcsd_pm_ops NULL
#define davinci_mmcsd_resume NULL
#endif #endif
static struct platform_driver davinci_mmcsd_driver = { static struct platform_driver davinci_mmcsd_driver = {
.driver = { .driver = {
.name = "davinci_mmc", .name = "davinci_mmc",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = davinci_mmcsd_pm_ops,
}, },
.remove = __exit_p(davinci_mmcsd_remove), .remove = __exit_p(davinci_mmcsd_remove),
.suspend = davinci_mmcsd_suspend,
.resume = davinci_mmcsd_resume,
}; };
static int __init davinci_mmcsd_init(void) static int __init davinci_mmcsd_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment