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 RFC 1/2] phy: qcom-snps-femto-v2: properly enable ref clock
Date: Mon, 29 May 2023 14:56:36 -0400 [thread overview]
Message-ID: <20230529185638.32376-2-athierry@redhat.com> (raw)
In-Reply-To: <20230529185638.32376-1-athierry@redhat.com>
The driver is not enabling the ref clock, which thus gets disabled by
the clk_disable_unused initcall. This leads to the dwc3 controller
failing to initialize if probed after clk_disable_unused is called, for
instance when the driver is built as a module.
To fix this, add calls to clk_prepare_enable/clk_disable_unprepare at
the proper places.
Signed-off-by: Adrien Thierry <athierry@redhat.com>
---
drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 20 +++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c b/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c
index 6c237f3cc66d..8abf482e81a8 100644
--- a/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c
+++ b/drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c
@@ -166,6 +166,7 @@ static int qcom_snps_hsphy_suspend(struct qcom_snps_hsphy *hsphy)
}
clk_disable_unprepare(hsphy->cfg_ahb_clk);
+ clk_disable_unprepare(hsphy->ref_clk);
return 0;
}
@@ -181,6 +182,12 @@ static int qcom_snps_hsphy_resume(struct qcom_snps_hsphy *hsphy)
return ret;
}
+ ret = clk_prepare_enable(hsphy->ref_clk);
+ if (ret) {
+ dev_err(&hsphy->phy->dev, "failed to enable ref clock\n");
+ return ret;
+ }
+
return 0;
}
@@ -380,10 +387,16 @@ static int qcom_snps_hsphy_init(struct phy *phy)
goto poweroff_phy;
}
+ ret = clk_prepare_enable(hsphy->ref_clk);
+ if (ret) {
+ dev_err(&phy->dev, "failed to enable ref clock, %d\n", ret);
+ goto disable_ahb_clk;
+ }
+
ret = reset_control_assert(hsphy->phy_reset);
if (ret) {
dev_err(&phy->dev, "failed to assert phy_reset, %d\n", ret);
- goto disable_ahb_clk;
+ goto disable_ref_clk;
}
usleep_range(100, 150);
@@ -391,7 +404,7 @@ static int qcom_snps_hsphy_init(struct phy *phy)
ret = reset_control_deassert(hsphy->phy_reset);
if (ret) {
dev_err(&phy->dev, "failed to de-assert phy_reset, %d\n", ret);
- goto disable_ahb_clk;
+ goto disable_ref_clk;
}
qcom_snps_hsphy_write_mask(hsphy->base, USB2_PHY_USB_PHY_CFG0,
@@ -448,6 +461,8 @@ static int qcom_snps_hsphy_init(struct phy *phy)
return 0;
+disable_ref_clk:
+ clk_disable_unprepare(hsphy->ref_clk);
disable_ahb_clk:
clk_disable_unprepare(hsphy->cfg_ahb_clk);
poweroff_phy:
@@ -462,6 +477,7 @@ static int qcom_snps_hsphy_exit(struct phy *phy)
reset_control_assert(hsphy->phy_reset);
clk_disable_unprepare(hsphy->cfg_ahb_clk);
+ clk_disable_unprepare(hsphy->ref_clk);
regulator_bulk_disable(ARRAY_SIZE(hsphy->vregs), hsphy->vregs);
hsphy->phy_initialized = false;
--
2.40.1
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
next prev parent reply other threads:[~2023-05-29 18:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-29 18:56 [PATCH RFC 0/2] Clock fixes for qcom-snps-femto-v2 PHY driver Adrien Thierry
2023-05-29 18:56 ` Adrien Thierry [this message]
2023-05-29 21:16 ` [PATCH RFC 1/2] phy: qcom-snps-femto-v2: properly enable ref clock Bjorn Andersson
2023-05-30 18:46 ` Adrien Thierry
2023-05-31 2:34 ` Bjorn Andersson
2023-06-01 17:09 ` Adrien Thierry
2023-05-30 13:22 ` Andrew Halaney
2023-05-29 18:56 ` [PATCH RFC 2/2] phy: qcom-snps-femto-v2: Remove AHB2PHY interface clock Adrien Thierry
2023-05-29 21:19 ` Bjorn Andersson
2023-06-01 17:12 ` 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=20230529185638.32376-2-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;
as well as URLs for NNTP newsgroup(s).