phy: qmp: Provide unique clock names for DP clocks

The USB/DP combo PHY exposes the "qmp_dp_phy_pll_link_clk" and
"qmp_dp_phy_pll_vco_div_clk" clocks, that are consumed by the display
clock controller. But for boards with multiple enabled QMP USB/DP combo
instances the hard coded names collides - and hence only the first
probed device is allowed to register.

Given that clocks are no longer reference globally by name and it's
possible to replace the hard coded names by something unique, but still
user friendly.

The two new clock names are based on dev_name() and results in names
such as "88ee000.phy::link_clk" and "88ee000.phy::vco_div_clk".

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20210722030738.3385821-1-bjorn.andersson@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index dd6174084600832bf1728f65dde8c8b44d6b7e8d..a8c4368f984bdc254ffbeed13b98c0d8cf8d2402 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -5195,6 +5195,7 @@ static int phy_dp_clks_register(struct qcom_qmp *qmp, struct qmp_phy *qphy,
 {
        struct clk_init_data init = { };
        struct qmp_phy_dp_clks *dp_clks;
+       char name[64];
        int ret;
 
        dp_clks = devm_kzalloc(qmp->dev, sizeof(*dp_clks), GFP_KERNEL);
@@ -5204,15 +5205,17 @@ static int phy_dp_clks_register(struct qcom_qmp *qmp, struct qmp_phy *qphy,
        dp_clks->qphy = qphy;
        qphy->dp_clks = dp_clks;
 
+       snprintf(name, sizeof(name), "%s::link_clk", dev_name(qmp->dev));
        init.ops = &qcom_qmp_dp_link_clk_ops;
-       init.name = "qmp_dp_phy_pll_link_clk";
+       init.name = name;
        dp_clks->dp_link_hw.init = &init;
        ret = devm_clk_hw_register(qmp->dev, &dp_clks->dp_link_hw);
        if (ret)
                return ret;
 
+       snprintf(name, sizeof(name), "%s::vco_div_clk", dev_name(qmp->dev));
        init.ops = &qcom_qmp_dp_pixel_clk_ops;
-       init.name = "qmp_dp_phy_pll_vco_div_clk";
+       init.name = name;
        dp_clks->dp_pixel_hw.init = &init;
        ret = devm_clk_hw_register(qmp->dev, &dp_clks->dp_pixel_hw);
        if (ret)