phy: qcom-qmp-combo: simplify clock handling

For the existing PHYs for new binding we are going to drop ref_clk_src
clock and always use ref clock. Rather than introducing additional code
to handle legacy vs current bindings (and clock names), use
devm_clk_bulk_get_optional() when new bindings are used and
devm_clk_bulk_get_all() when legacy bindings are in place.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230711120916.4165894-3-dmitry.baryshkov@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
index e373b6b..0220924 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
@@ -1358,9 +1358,6 @@ struct qmp_phy_cfg {
        int (*calibrate_dp_phy)(struct qmp_combo *qmp);
        void (*dp_aux_init)(struct qmp_combo *qmp);
 
-       /* clock ids to be requested */
-       const char * const *clk_list;
-       int num_clks;
        /* resets to be requested */
        const char * const *reset_list;
        int num_resets;
@@ -1402,6 +1399,7 @@ struct qmp_combo {
 
        struct clk *pipe_clk;
        struct clk_bulk_data *clks;
+       int num_clks;
        struct reset_control_bulk_data *resets;
        struct regulator_bulk_data *vregs;
 
@@ -1462,19 +1460,10 @@ static inline void qphy_clrbits(void __iomem *base, u32 offset, u32 val)
 }
 
 /* list of clocks required by phy */
-static const char * const qmp_v3_phy_clk_l[] = {
+static const char * const qmp_combo_phy_clk_l[] = {
        "aux", "cfg_ahb", "ref", "com_aux",
 };
 
-static const char * const qmp_v4_phy_clk_l[] = {
-       "aux", "ref", "com_aux",
-};
-
-/* the primary usb3 phy on sm8250 doesn't have a ref clock */
-static const char * const qmp_v4_sm8250_usbphy_clk_l[] = {
-       "aux", "ref_clk_src", "com_aux"
-};
-
 /* list of resets */
 static const char * const msm8996_usb3phy_reset_l[] = {
        "phy", "common",
@@ -1548,8 +1537,6 @@ static const struct qmp_phy_cfg sc7180_usb3dpphy_cfg = {
        .configure_dp_phy       = qmp_v3_configure_dp_phy,
        .calibrate_dp_phy       = qmp_v3_calibrate_dp_phy,
 
-       .clk_list               = qmp_v3_phy_clk_l,
-       .num_clks               = ARRAY_SIZE(qmp_v3_phy_clk_l),
        .reset_list             = sc7180_usb3phy_reset_l,
        .num_resets             = ARRAY_SIZE(sc7180_usb3phy_reset_l),
        .vreg_list              = qmp_phy_vreg_l,
@@ -1593,8 +1580,6 @@ static const struct qmp_phy_cfg sdm845_usb3dpphy_cfg = {
        .configure_dp_phy       = qmp_v3_configure_dp_phy,
        .calibrate_dp_phy       = qmp_v3_calibrate_dp_phy,
 
-       .clk_list               = qmp_v3_phy_clk_l,
-       .num_clks               = ARRAY_SIZE(qmp_v3_phy_clk_l),
        .reset_list             = msm8996_usb3phy_reset_l,
        .num_resets             = ARRAY_SIZE(msm8996_usb3phy_reset_l),
        .vreg_list              = qmp_phy_vreg_l,
@@ -1640,8 +1625,6 @@ static const struct qmp_phy_cfg sc8180x_usb3dpphy_cfg = {
        .configure_dp_phy       = qmp_v4_configure_dp_phy,
        .calibrate_dp_phy       = qmp_v4_calibrate_dp_phy,
 
-       .clk_list               = qmp_v4_phy_clk_l,
-       .num_clks               = ARRAY_SIZE(qmp_v4_phy_clk_l),
        .reset_list             = msm8996_usb3phy_reset_l,
        .num_resets             = ARRAY_SIZE(msm8996_usb3phy_reset_l),
        .vreg_list              = qmp_phy_vreg_l,
@@ -1688,8 +1671,6 @@ static const struct qmp_phy_cfg sc8280xp_usb43dpphy_cfg = {
        .configure_dp_phy       = qmp_v4_configure_dp_phy,
        .calibrate_dp_phy       = qmp_v4_calibrate_dp_phy,
 
-       .clk_list               = qmp_v4_phy_clk_l,
-       .num_clks               = ARRAY_SIZE(qmp_v4_phy_clk_l),
        .reset_list             = msm8996_usb3phy_reset_l,
        .num_resets             = ARRAY_SIZE(msm8996_usb3phy_reset_l),
        .vreg_list              = qmp_phy_vreg_l,
@@ -1733,8 +1714,6 @@ static const struct qmp_phy_cfg sm6350_usb3dpphy_cfg = {
        .configure_dp_phy       = qmp_v3_configure_dp_phy,
        .calibrate_dp_phy       = qmp_v3_calibrate_dp_phy,
 
-       .clk_list               = qmp_v4_phy_clk_l,
-       .num_clks               = ARRAY_SIZE(qmp_v4_phy_clk_l),
        .reset_list             = msm8996_usb3phy_reset_l,
        .num_resets             = ARRAY_SIZE(msm8996_usb3phy_reset_l),
        .vreg_list              = qmp_phy_vreg_l,
@@ -1778,8 +1757,6 @@ static const struct qmp_phy_cfg sm8250_usb3dpphy_cfg = {
        .configure_dp_phy       = qmp_v4_configure_dp_phy,
        .calibrate_dp_phy       = qmp_v4_calibrate_dp_phy,
 
-       .clk_list               = qmp_v4_sm8250_usbphy_clk_l,
-       .num_clks               = ARRAY_SIZE(qmp_v4_sm8250_usbphy_clk_l),
        .reset_list             = msm8996_usb3phy_reset_l,
        .num_resets             = ARRAY_SIZE(msm8996_usb3phy_reset_l),
        .vreg_list              = qmp_phy_vreg_l,
@@ -1828,8 +1805,6 @@ static const struct qmp_phy_cfg sm8350_usb3dpphy_cfg = {
        .configure_dp_phy       = qmp_v4_configure_dp_phy,
        .calibrate_dp_phy       = qmp_v4_calibrate_dp_phy,
 
-       .clk_list               = qmp_v4_phy_clk_l,
-       .num_clks               = ARRAY_SIZE(qmp_v4_phy_clk_l),
        .reset_list             = msm8996_usb3phy_reset_l,
        .num_resets             = ARRAY_SIZE(msm8996_usb3phy_reset_l),
        .vreg_list              = qmp_phy_vreg_l,
@@ -1878,8 +1853,6 @@ static const struct qmp_phy_cfg sm8550_usb3dpphy_cfg = {
        .calibrate_dp_phy       = qmp_v4_calibrate_dp_phy,
 
        .regs                   = qmp_v6_usb3phy_regs_layout,
-       .clk_list               = qmp_v4_phy_clk_l,
-       .num_clks               = ARRAY_SIZE(qmp_v4_phy_clk_l),
        .reset_list             = msm8996_usb3phy_reset_l,
        .num_resets             = ARRAY_SIZE(msm8996_usb3phy_reset_l),
        .vreg_list              = qmp_phy_vreg_l,
@@ -2432,7 +2405,7 @@ static int qmp_combo_com_init(struct qmp_combo *qmp, bool force)
                goto err_disable_regulators;
        }
 
-       ret = clk_bulk_prepare_enable(cfg->num_clks, qmp->clks);
+       ret = clk_bulk_prepare_enable(qmp->num_clks, qmp->clks);
        if (ret)
                goto err_assert_reset;
 
@@ -2482,7 +2455,7 @@ static int qmp_combo_com_exit(struct qmp_combo *qmp, bool force)
 
        reset_control_bulk_assert(cfg->num_resets, qmp->resets);
 
-       clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks);
+       clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks);
 
        regulator_bulk_disable(cfg->num_vregs, qmp->vregs);
 
@@ -2761,7 +2734,6 @@ static void qmp_combo_disable_autonomous_mode(struct qmp_combo *qmp)
 static int __maybe_unused qmp_combo_runtime_suspend(struct device *dev)
 {
        struct qmp_combo *qmp = dev_get_drvdata(dev);
-       const struct qmp_phy_cfg *cfg = qmp->cfg;
 
        dev_vdbg(dev, "Suspending QMP phy, mode:%d\n", qmp->mode);
 
@@ -2773,7 +2745,7 @@ static int __maybe_unused qmp_combo_runtime_suspend(struct device *dev)
        qmp_combo_enable_autonomous_mode(qmp);
 
        clk_disable_unprepare(qmp->pipe_clk);
-       clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks);
+       clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks);
 
        return 0;
 }
@@ -2781,7 +2753,6 @@ static int __maybe_unused qmp_combo_runtime_suspend(struct device *dev)
 static int __maybe_unused qmp_combo_runtime_resume(struct device *dev)
 {
        struct qmp_combo *qmp = dev_get_drvdata(dev);
-       const struct qmp_phy_cfg *cfg = qmp->cfg;
        int ret = 0;
 
        dev_vdbg(dev, "Resuming QMP phy, mode:%d\n", qmp->mode);
@@ -2791,14 +2762,14 @@ static int __maybe_unused qmp_combo_runtime_resume(struct device *dev)
                return 0;
        }
 
-       ret = clk_bulk_prepare_enable(cfg->num_clks, qmp->clks);
+       ret = clk_bulk_prepare_enable(qmp->num_clks, qmp->clks);
        if (ret)
                return ret;
 
        ret = clk_prepare_enable(qmp->pipe_clk);
        if (ret) {
                dev_err(dev, "pipe_clk enable failed, err=%d\n", ret);
-               clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks);
+               clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks);
                return ret;
        }
 
@@ -2869,9 +2840,8 @@ static int qmp_combo_reset_init(struct qmp_combo *qmp)
 
 static int qmp_combo_clk_init(struct qmp_combo *qmp)
 {
-       const struct qmp_phy_cfg *cfg = qmp->cfg;
        struct device *dev = qmp->dev;
-       int num = cfg->num_clks;
+       int num = ARRAY_SIZE(qmp_combo_phy_clk_l);
        int i;
 
        qmp->clks = devm_kcalloc(dev, num, sizeof(*qmp->clks), GFP_KERNEL);
@@ -2879,9 +2849,11 @@ static int qmp_combo_clk_init(struct qmp_combo *qmp)
                return -ENOMEM;
 
        for (i = 0; i < num; i++)
-               qmp->clks[i].id = cfg->clk_list[i];
+               qmp->clks[i].id = qmp_combo_phy_clk_l[i];
 
-       return devm_clk_bulk_get(dev, num, qmp->clks);
+       qmp->num_clks = num;
+
+       return devm_clk_bulk_get_optional(dev, num, qmp->clks);
 }
 
 static void phy_clk_release_provider(void *res)
@@ -3087,6 +3059,12 @@ static int phy_dp_clks_register(struct qmp_combo *qmp, struct device_node *np)
        if (ret)
                return ret;
 
+       ret = devm_clk_bulk_get_all(qmp->dev, &qmp->clks);
+       if (ret < 0)
+               return ret;
+
+       qmp->num_clks = ret;
+
        return 0;
 }
 
@@ -3356,6 +3334,7 @@ static int qmp_combo_parse_dt(struct qmp_combo *qmp)
        const struct qmp_combo_offsets *offs = cfg->offsets;
        struct device *dev = qmp->dev;
        void __iomem *base;
+       int ret;
 
        if (!offs)
                return -EINVAL;
@@ -3385,6 +3364,10 @@ static int qmp_combo_parse_dt(struct qmp_combo *qmp)
        }
        qmp->dp_dp_phy = base + offs->dp_dp_phy;
 
+       ret = qmp_combo_clk_init(qmp);
+       if (ret)
+               return ret;
+
        qmp->pipe_clk = devm_clk_get(dev, "usb3_pipe");
        if (IS_ERR(qmp->pipe_clk)) {
                return dev_err_probe(dev, PTR_ERR(qmp->pipe_clk),
@@ -3433,10 +3416,6 @@ static int qmp_combo_probe(struct platform_device *pdev)
 
        mutex_init(&qmp->phy_mutex);
 
-       ret = qmp_combo_clk_init(qmp);
-       if (ret)
-               return ret;
-
        ret = qmp_combo_reset_init(qmp);
        if (ret)
                return ret;