| Message ID | 20210722030738.3385821-1-bjorn.andersson@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | phy: qmp: Provide unique clock names for DP clocks | expand |
Quoting Bjorn Andersson (2021-07-21 20:07:38) > 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> Maybe we should make this a clk flag like CLK_NAME_PREFIX_DEVNAME so that clk_init_data::name is prefixed with dev_name() so the caller doesn't have to do the concatenation themselves.
On 21-07-21, 20:07, Bjorn Andersson wrote: > 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". Applied, thanks
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index b7f2e36d7960..61707d99a9eb 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -5213,6 +5213,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); @@ -5222,15 +5223,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)
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> --- drivers/phy/qualcomm/phy-qcom-qmp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)