OSDN Git Service

phy: qcom: edp: Generate unique clock names
authorBjorn Andersson <bjorn.andersson@linaro.org>
Wed, 10 Aug 2022 04:07:42 +0000 (21:07 -0700)
committerVinod Koul <vkoul@kernel.org>
Tue, 30 Aug 2022 05:31:23 +0000 (11:01 +0530)
With multiple Displayport PHYs the hard coded clock names collides,
generate unique clock names based on the device name instead.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220810040745.3582985-3-bjorn.andersson@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/phy/qualcomm/phy-qcom-edp.c

index 7e35707..41aa282 100644 (file)
@@ -571,21 +571,24 @@ static int qcom_edp_clks_register(struct qcom_edp *edp, struct device_node *np)
 {
        struct clk_hw_onecell_data *data;
        struct clk_init_data init = { };
+       char name[64];
        int ret;
 
        data = devm_kzalloc(edp->dev, struct_size(data, hws, 2), GFP_KERNEL);
        if (!data)
                return -ENOMEM;
 
+       snprintf(name, sizeof(name), "%s::link_clk", dev_name(edp->dev));
        init.ops = &qcom_edp_dp_link_clk_ops;
-       init.name = "edp_phy_pll_link_clk";
+       init.name = name;
        edp->dp_link_hw.init = &init;
        ret = devm_clk_hw_register(edp->dev, &edp->dp_link_hw);
        if (ret)
                return ret;
 
+       snprintf(name, sizeof(name), "%s::vco_div_clk", dev_name(edp->dev));
        init.ops = &qcom_edp_dp_pixel_clk_ops;
-       init.name = "edp_phy_pll_vco_div_clk";
+       init.name = name;
        edp->dp_pixel_hw.init = &init;
        ret = devm_clk_hw_register(edp->dev, &edp->dp_pixel_hw);
        if (ret)