From: Adrien Thierry <athierry@redhat.com>
To: Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Vinod Koul <vkoul@kernel.org>,
Kishon Vijay Abraham I <kishon@kernel.org>
Cc: Adrien Thierry <athierry@redhat.com>,
linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org
Subject: [PATCH v3 2/3] phy: qcom-snps-femto-v2: add system sleep PM ops
Date: Thu, 22 Jun 2023 15:40:19 -0400 [thread overview]
Message-ID: <20230622194021.80892-3-athierry@redhat.com> (raw)
In-Reply-To: <20230622194021.80892-1-athierry@redhat.com>
The downstream driver [1] implements set_suspend(), which deals with
both runtime and system sleep/resume. The upstream driver already has
runtime PM ops, so add the system sleep PM ops as well, reusing the same
code as the runtime PM ops.
[1] https://git.codelinaro.org/clo/la/kernel/msm-5.4/-/blob/LV.AU.1.2.1.r2-05300-gen3meta.0/drivers/usb/phy/phy-msm-snps-hs.c
Signed-off-by: Adrien Thierry <athierry@redhat.com>
---
drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c b/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c
index ce1d2f8b568a..378a5029f61e 100644
--- a/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c
+++ b/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c
@@ -179,7 +179,7 @@ static inline void qcom_snps_hsphy_write_mask(void __iomem *base, u32 offset,
readl_relaxed(base + offset);
}
-static int qcom_snps_hsphy_suspend(struct qcom_snps_hsphy *hsphy)
+static int qcom_snps_hsphy_do_suspend(struct qcom_snps_hsphy *hsphy)
{
dev_dbg(&hsphy->phy->dev, "Suspend QCOM SNPS PHY\n");
@@ -199,7 +199,7 @@ static int qcom_snps_hsphy_suspend(struct qcom_snps_hsphy *hsphy)
return 0;
}
-static int qcom_snps_hsphy_resume(struct qcom_snps_hsphy *hsphy)
+static int qcom_snps_hsphy_do_resume(struct qcom_snps_hsphy *hsphy)
{
int ret;
@@ -214,25 +214,25 @@ static int qcom_snps_hsphy_resume(struct qcom_snps_hsphy *hsphy)
return 0;
}
-static int __maybe_unused qcom_snps_hsphy_runtime_suspend(struct device *dev)
+static int __maybe_unused qcom_snps_hsphy_suspend(struct device *dev)
{
struct qcom_snps_hsphy *hsphy = dev_get_drvdata(dev);
if (!hsphy->phy_initialized)
return 0;
- qcom_snps_hsphy_suspend(hsphy);
+ qcom_snps_hsphy_do_suspend(hsphy);
return 0;
}
-static int __maybe_unused qcom_snps_hsphy_runtime_resume(struct device *dev)
+static int __maybe_unused qcom_snps_hsphy_resume(struct device *dev)
{
struct qcom_snps_hsphy *hsphy = dev_get_drvdata(dev);
if (!hsphy->phy_initialized)
return 0;
- qcom_snps_hsphy_resume(hsphy);
+ qcom_snps_hsphy_do_resume(hsphy);
return 0;
}
@@ -518,8 +518,10 @@ static const struct of_device_id qcom_snps_hsphy_of_match_table[] = {
MODULE_DEVICE_TABLE(of, qcom_snps_hsphy_of_match_table);
static const struct dev_pm_ops qcom_snps_hsphy_pm_ops = {
- SET_RUNTIME_PM_OPS(qcom_snps_hsphy_runtime_suspend,
- qcom_snps_hsphy_runtime_resume, NULL)
+ SET_RUNTIME_PM_OPS(qcom_snps_hsphy_suspend,
+ qcom_snps_hsphy_resume, NULL)
+ SET_SYSTEM_SLEEP_PM_OPS(qcom_snps_hsphy_suspend,
+ qcom_snps_hsphy_resume)
};
static void qcom_snps_hsphy_override_param_update_val(
--
2.40.1
next prev parent reply other threads:[~2023-06-22 19:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-22 19:40 [PATCH v3 0/3] Fixes for qcom-snps-femto-v2 PHY driver Adrien Thierry
2023-06-22 19:40 ` [PATCH v3 1/3] phy: qcom-snps-femto-v2: properly enable ref clock Adrien Thierry
2023-06-22 21:34 ` Bjorn Andersson
2023-06-22 19:40 ` Adrien Thierry [this message]
2023-06-22 21:43 ` [PATCH v3 2/3] phy: qcom-snps-femto-v2: add system sleep PM ops Bjorn Andersson
2023-06-27 18:08 ` Adrien Thierry
2023-06-27 23:06 ` Bjorn Andersson
2023-06-27 18:12 ` Adrien Thierry
2023-06-27 22:56 ` Bjorn Andersson
2023-06-22 19:40 ` [PATCH v3 3/3] phy: qcom-snps-femto-v2: use qcom_snps_hsphy_do_suspend/resume error code Adrien Thierry
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=20230622194021.80892-3-athierry@redhat.com \
--to=athierry@redhat.com \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=kishon@kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=vkoul@kernel.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