[PATCH v2] phy: qualcomm: qmp-combo: Differentiate clocks related to the USB block
From: Wesley Cheng
Date: Tue Nov 17 2026 - 18:02:33 EST
The Qualcomm QMP combo PHY has a USB and Displayport block that is
sourced with different clocks. In situations where the USB path is not
utilized, and only Displayport is active, unnecessary clocks are enabled
and not used. Split the current clock list into USB specific clocks,
which will be enabled whenever the USB initialization routine is
executed.
In addition, move autonomous mode control specifically when USB is
active, as its primary purpose is to detect RX detection and LFPS
signals, which occurs only when USB is active.
Signed-off-by: Wesley Cheng <wesley.cheng@xxxxxxxxxxxxxxxx>
---
Changes in v2:
- Added proper error path cleanup with the introduction of a new set of
clocks.
- Enable/disable usb_clks accoridngly with the usb4 path.
- Link to v1: https://patch.msgid.link/20260930-qmp_phy_usb_clks_v1-v1-1-d4dccc9eb263@xxxxxxxxxxxxxxxx
---
drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 76 ++++++++++++++++++++++++++-----
1 file changed, 64 insertions(+), 12 deletions(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
index 187f0cd11f6c..bb9eee2f3f0b 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
@@ -2619,8 +2619,10 @@ struct qmp_combo {
struct clk *pipe_clk;
struct clk_bulk_data *clks;
- struct clk *p2rr2p_pipe_clk;
int num_clks;
+ struct clk_bulk_data *usb_clks;
+ int num_usb_clks;
+ struct clk *p2rr2p_pipe_clk;
struct reset_control_bulk_data *resets;
struct regulator_bulk_data *vregs;
@@ -2668,7 +2670,11 @@ static int qmp_v8_configure_dp_phy(struct qmp_combo *qmp);
/* list of clocks required by phy */
static const char * const qmp_combo_phy_clk_l[] = {
- "aux", "cfg_ahb", "ref", "com_aux",
+ "cfg_ahb", "ref",
+};
+
+static const char * const qmp_combo_usb_phy_clk_l[] = {
+ "aux", "com_aux",
};
/* list of resets */
@@ -4455,13 +4461,20 @@ static int qmp_combo_usb_init(struct phy *phy)
return 0;
}
- ret = qmp_combo_com_init(qmp, false);
+ ret = clk_bulk_prepare_enable(qmp->num_usb_clks, qmp->usb_clks);
if (ret)
return ret;
+ ret = qmp_combo_com_init(qmp, false);
+ if (ret) {
+ clk_bulk_disable_unprepare(qmp->num_usb_clks, qmp->usb_clks);
+ return ret;
+ }
+
ret = qmp_combo_usb_power_on(phy);
if (ret) {
qmp_combo_com_exit(qmp, false);
+ clk_bulk_disable_unprepare(qmp->num_usb_clks, qmp->usb_clks);
return ret;
}
@@ -4492,6 +4505,8 @@ static int qmp_combo_usb_exit(struct phy *phy)
if (ret)
return ret;
+ clk_bulk_disable_unprepare(qmp->num_usb_clks, qmp->usb_clks);
+
qmp->usb_init_count--;
return 0;
@@ -4547,6 +4562,10 @@ static int qmp_combo_usb4_init(struct phy *phy)
return -EINVAL;
}
+ ret = clk_bulk_prepare_enable(qmp->num_usb_clks, qmp->usb_clks);
+ if (ret)
+ return ret;
+
ret = clk_prepare_enable(qmp->p2rr2p_pipe_clk);
if (ret) {
dev_err(qmp->dev, "p2rr2p_pipe enable failed: %d\n", ret);
@@ -4606,6 +4625,7 @@ static int qmp_combo_usb4_exit(struct phy *phy)
qmp->usb4_init_count--;
clk_disable_unprepare(qmp->p2rr2p_pipe_clk);
+ clk_bulk_disable_unprepare(qmp->num_usb_clks, qmp->usb_clks);
return 0;
}
@@ -4722,7 +4742,10 @@ static int __maybe_unused qmp_combo_runtime_suspend(struct device *dev)
return 0;
}
- qmp_combo_enable_autonomous_mode(qmp);
+ if (qmp->usb_init_count) {
+ qmp_combo_enable_autonomous_mode(qmp);
+ clk_bulk_disable_unprepare(qmp->num_usb_clks, qmp->usb_clks);
+ }
clk_disable_unprepare(qmp->pipe_clk);
clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks);
@@ -4749,13 +4772,27 @@ static int __maybe_unused qmp_combo_runtime_resume(struct device *dev)
ret = clk_prepare_enable(qmp->pipe_clk);
if (ret) {
dev_err(dev, "pipe_clk enable failed, err=%d\n", ret);
- clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks);
- return ret;
+ goto disable_clks;
}
- qmp_combo_disable_autonomous_mode(qmp);
+ if (qmp->usb_init_count) {
+ ret = clk_bulk_prepare_enable(qmp->num_usb_clks, qmp->usb_clks);
+ if (ret) {
+ dev_err(dev, "usb_clks enable failed, err=%d\n", ret);
+ goto disable_pipe_clk;
+ }
+
+ qmp_combo_disable_autonomous_mode(qmp);
+ }
return 0;
+
+disable_pipe_clk:
+ clk_disable_unprepare(qmp->pipe_clk);
+disable_clks:
+ clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks);
+
+ return ret;
}
static const struct dev_pm_ops qmp_combo_pm_ops = {
@@ -4788,19 +4825,34 @@ static int qmp_combo_reset_init(struct qmp_combo *qmp)
static int qmp_combo_clk_init(struct qmp_combo *qmp)
{
struct device *dev = qmp->dev;
- int num = ARRAY_SIZE(qmp_combo_phy_clk_l);
+ int num_clks = ARRAY_SIZE(qmp_combo_phy_clk_l);
+ int num_usb_clks = ARRAY_SIZE(qmp_combo_usb_phy_clk_l);
int i;
+ int ret;
- qmp->clks = devm_kcalloc(dev, num, sizeof(*qmp->clks), GFP_KERNEL);
+ qmp->clks = devm_kcalloc(dev, num_clks, sizeof(*qmp->clks), GFP_KERNEL);
if (!qmp->clks)
return -ENOMEM;
- for (i = 0; i < num; i++)
+ for (i = 0; i < num_clks; i++)
qmp->clks[i].id = qmp_combo_phy_clk_l[i];
- qmp->num_clks = num;
+ qmp->num_clks = num_clks;
+
+ qmp->usb_clks = devm_kcalloc(dev, num_usb_clks, sizeof(*qmp->usb_clks), GFP_KERNEL);
+ if (!qmp->usb_clks)
+ return -ENOMEM;
+
+ for (i = 0; i < num_usb_clks; i++)
+ qmp->usb_clks[i].id = qmp_combo_usb_phy_clk_l[i];
+
+ qmp->num_usb_clks = num_usb_clks;
+
+ ret = devm_clk_bulk_get_optional(dev, num_clks, qmp->clks);
+ if (ret)
+ return ret;
- return devm_clk_bulk_get_optional(dev, num, qmp->clks);
+ return devm_clk_bulk_get_optional(dev, num_usb_clks, qmp->usb_clks);
}
static void phy_clk_release_provider(void *res)
---
base-commit: 6bdfbe223ed4735073c299a6645ebd3faac3f51f
change-id: 20260930-qmp_phy_usb_clks_v1-25b9374086b2
Best regards,
--
Wesley Cheng <wesley.cheng@xxxxxxxxxxxxxxxx>