phy: qcom: qmp-pcie: refactor clock register code

The PCIe Gen4x2 PHY found in the SM8[456]50 SoCs have a second clock,
in order to expose it, split the current clock registering in two parts:
- CCF clock registering
- DT clock registering

Keep the of_clk_add_hw_provider/devm_add_action_or_reset to keep
compatibility with the legacy subnode bindings.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240322-topic-sm8x50-upstream-pcie-1-phy-aux-clk-v2-2-3ec0a966d52f@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 8836bb1ff0cc1ee31b7778b23f7a5c766091a67c..e8da2e9146dc146592f1fab665ec08729d53934a 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
@@ -3664,7 +3664,7 @@ static int phy_pipe_clk_register(struct qmp_pcie *qmp, struct device_node *np)
        struct clk_init_data init = { };
        int ret;
 
-       ret = of_property_read_string(np, "clock-output-names", &init.name);
+       ret = of_property_read_string_index(np, "clock-output-names", 0, &init.name);
        if (ret) {
                dev_err(qmp->dev, "%pOFn: No clock-output-names\n", np);
                return ret;
@@ -3683,11 +3683,18 @@ static int phy_pipe_clk_register(struct qmp_pcie *qmp, struct device_node *np)
 
        fixed->hw.init = &init;
 
-       ret = devm_clk_hw_register(qmp->dev, &fixed->hw);
+       return devm_clk_hw_register(qmp->dev, &fixed->hw);
+}
+
+static int qmp_pcie_register_clocks(struct qmp_pcie *qmp, struct device_node *np)
+{
+       int ret;
+
+       ret = phy_pipe_clk_register(qmp, np);
        if (ret)
                return ret;
 
-       ret = of_clk_add_hw_provider(np, of_clk_hw_simple_get, &fixed->hw);
+       ret = of_clk_add_hw_provider(np, of_clk_hw_simple_get, &qmp->pipe_clk_fixed.hw);
        if (ret)
                return ret;
 
@@ -3899,7 +3906,7 @@ static int qmp_pcie_probe(struct platform_device *pdev)
        if (ret)
                goto err_node_put;
 
-       ret = phy_pipe_clk_register(qmp, np);
+       ret = qmp_pcie_register_clocks(qmp, np);
        if (ret)
                goto err_node_put;