phy: qcom: qmp-pcie: restore compatibility with existing DTs

Existing device trees specify only a single clock-output-name for the
PCIe PHYs. The function phy_aux_clk_register() expects a second entry in
that property. When it doesn't find it, it returns an error, thus
failing the probe of the PHY and thus breaking support for the
corresponding PCIe host.

Follow the approach of the combo USB+DT PHY and generate the name for
the AUX clocks instead of requiring it in DT.

Fixes: 583ca9ccfa80 ("phy: qcom: qmp-pcie: register second optional PHY AUX clock")
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240614-fix-pcie-phy-compat-v3-1-730d1811acf4@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
index 8cb91b9114d61da08eb3b26214cb031955a962fa..5b36cc7ac78bbc929e2d0515f2f1c54fb0dbc4b5 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
@@ -4033,14 +4033,11 @@ static int phy_aux_clk_register(struct qmp_pcie *qmp, struct device_node *np)
 {
        struct clk_fixed_rate *fixed = &qmp->aux_clk_fixed;
        struct clk_init_data init = { };
-       int ret;
+       char name[64];
 
-       ret = of_property_read_string_index(np, "clock-output-names", 1, &init.name);
-       if (ret) {
-               dev_err(qmp->dev, "%pOFn: No clock-output-names index 1\n", np);
-               return ret;
-       }
+       snprintf(name, sizeof(name), "%s::phy_aux_clk", dev_name(qmp->dev));
 
+       init.name = name;
        init.ops = &clk_fixed_rate_ops;
 
        fixed->fixed_rate = qmp->cfg->aux_clock_rate;