From: Shawn Lin <shawn.lin@rock-chips.com>
To: Jaehoon Chung <jh80.chung@samsung.com>,
Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-mmc@vger.kernel.org, Doug Anderson <dianders@chromium.org>,
linux-rockchip@lists.infradead.org,
Shawn Lin <shawn.lin@rock-chips.com>
Subject: [RESEND PATCH 6/9] mmc: dw_mmc-exynos: deploay runtime PM facilities
Date: Sun, 9 Oct 2016 22:01:58 +0800 [thread overview]
Message-ID: <1476021721-923-2-git-send-email-shawn.lin@rock-chips.com> (raw)
In-Reply-To: <1476021721-923-1-git-send-email-shawn.lin@rock-chips.com>
Let's migrate it to use runtime PM and remove the system
PM callback from this driver. With this patch, it could
handle system PM properly and could also use runtime PM
if we enable it.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
drivers/mmc/host/dw_mmc-exynos.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
index 7ab3d74..189fd38 100644
--- a/drivers/mmc/host/dw_mmc-exynos.c
+++ b/drivers/mmc/host/dw_mmc-exynos.c
@@ -17,6 +17,7 @@
#include <linux/mmc/mmc.h>
#include <linux/of.h>
#include <linux/of_gpio.h>
+#include <linux/pm_runtime.h>
#include <linux/slab.h>
#include "dw_mmc.h"
@@ -161,20 +162,20 @@ static void dw_mci_exynos_set_clksel_timing(struct dw_mci *host, u32 timing)
set_bit(DW_MMC_CARD_NO_USE_HOLD, &host->cur_slot->flags);
}
-#ifdef CONFIG_PM_SLEEP
-static int dw_mci_exynos_suspend(struct device *dev)
+#ifdef CONFIG_PM
+static int dw_mci_exynos_runtime_suspend(struct device *dev)
{
struct dw_mci *host = dev_get_drvdata(dev);
- return dw_mci_suspend(host);
+ return dw_mci_runtime_suspend(host);
}
-static int dw_mci_exynos_resume(struct device *dev)
+static int dw_mci_exynos_runtime_resume(struct device *dev)
{
struct dw_mci *host = dev_get_drvdata(dev);
dw_mci_exynos_config_smu(host);
- return dw_mci_resume(host);
+ return dw_mci_runtime_resume(host);
}
/**
@@ -211,10 +212,8 @@ static int dw_mci_exynos_resume_noirq(struct device *dev)
return 0;
}
#else
-#define dw_mci_exynos_suspend NULL
-#define dw_mci_exynos_resume NULL
#define dw_mci_exynos_resume_noirq NULL
-#endif /* CONFIG_PM_SLEEP */
+#endif /* CONFIG_PM */
static void dw_mci_exynos_config_hs400(struct dw_mci *host, u32 timing)
{
@@ -531,7 +530,11 @@ static int dw_mci_exynos_probe(struct platform_device *pdev)
}
static const struct dev_pm_ops dw_mci_exynos_pmops = {
- SET_SYSTEM_SLEEP_PM_OPS(dw_mci_exynos_suspend, dw_mci_exynos_resume)
+ SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
+ pm_runtime_force_resume)
+ SET_RUNTIME_PM_OPS(dw_mci_exynos_runtime_suspend,
+ dw_mci_exynos_runtime_resume,
+ NULL)
.resume_noirq = dw_mci_exynos_resume_noirq,
.thaw_noirq = dw_mci_exynos_resume_noirq,
.restore_noirq = dw_mci_exynos_resume_noirq,
--
2.3.7
next prev parent reply other threads:[~2016-10-09 13:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20161009135255epcas1p4d5a9db74bb1dea56f61fcb2a720a07f0@epcas1p4.samsung.com>
2016-10-09 13:58 ` [RESEND PATCH 0/9] Init runtime PM support for dw_mmc Shawn Lin
2016-10-09 13:58 ` [RESEND PATCH 1/9] mmc: dw_mmc: add runtime PM callback Shawn Lin
2016-10-09 13:58 ` [RESEND PATCH 2/9] mmc: dw_mmc-rockchip: add runtime PM support Shawn Lin
2016-10-09 13:58 ` [RESEND PATCH 3/9] mmc: core: expose the capability of gpio card detect Shawn Lin
2016-10-09 13:58 ` [RESEND PATCH 4/9] mmc: dw_mmc-rockchip: disable biu clk if possible Shawn Lin
2016-10-09 14:01 ` [RESEND PATCH 5/9] mmc: dw_mmc-k3: deploay runtime PM facilities Shawn Lin
2016-10-09 14:01 ` Shawn Lin [this message]
2016-10-09 14:01 ` [RESEND PATCH 7/9] mmc: dw_mmc-pci: " Shawn Lin
[not found] ` <1476021721-923-1-git-send-email-shawn.lin-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2016-10-09 14:02 ` [RESEND PATCH 8/9] mmc: dw_mmc-pltfm: " Shawn Lin
2016-10-09 14:02 ` [RESEND PATCH 9/9] mmc: dw_mmc: remove system PM callback Shawn Lin
2016-10-10 2:10 ` [RESEND PATCH 0/9] Init runtime PM support for dw_mmc Jaehoon Chung
2016-10-10 2:30 ` Shawn Lin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476021721-923-2-git-send-email-shawn.lin@rock-chips.com \
--to=shawn.lin@rock-chips.com \
--cc=dianders@chromium.org \
--cc=jh80.chung@samsung.com \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox