diff options
| author | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2023-08-21 02:58:13 +0300 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2023-08-22 19:35:13 +0530 |
| commit | b83eb8ba2ab9551217ed36320b8999db2f351e57 (patch) | |
| tree | 46000057aad600d79e5b43a55bfb74518319abe8 /drivers/phy/qualcomm/phy-qcom-qmp-combo.c | |
| parent | 4807ff70e228b5e9c6ea6c7c5651a3fd74a5cfda (diff) | |
| download | linux-stable-b83eb8ba2ab9551217ed36320b8999db2f351e57.tar.gz linux-stable-b83eb8ba2ab9551217ed36320b8999db2f351e57.tar.bz2 linux-stable-b83eb8ba2ab9551217ed36320b8999db2f351e57.zip | |
phy: qcom-qmp-combo: fix clock probing
During rebase of qcom-qmp-combo series a call to devm_clk_bulk_get_all()
got moved by git from qmp_combo_parse_dt_legacy() to
phy_dp_clks_register(). This doesn't have any serious effect, since the
clocks will be set in both legacy and non-legacy paths. However let's
move it back to place anyway, to prevent the driver from fetching clocks
twice.
Fixes: 28e265bf84a8 ("phy: qcom-qmp-combo: simplify clock handling")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230820235813.562284-1-dmitry.baryshkov@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/phy/qualcomm/phy-qcom-qmp-combo.c')
| -rw-r--r-- | drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index 9c3de41ecedb..cbb28afce135 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -3067,12 +3067,6 @@ static int phy_dp_clks_register(struct qmp_combo *qmp, struct device_node *np) if (ret) return ret; - ret = devm_clk_bulk_get_all(qmp->dev, &qmp->clks); - if (ret < 0) - return ret; - - qmp->num_clks = ret; - return 0; } @@ -3332,6 +3326,12 @@ static int qmp_combo_parse_dt_legacy(struct qmp_combo *qmp, struct device_node * if (ret) return ret; + ret = devm_clk_bulk_get_all(qmp->dev, &qmp->clks); + if (ret < 0) + return ret; + + qmp->num_clks = ret; + return 0; } |