phy: qcom-qmp-combo: clean up serdes initialisation

Clean up serdes initialisation somewhat by making the current helper a
dedicated helper for the DP part of the PHY.

Note that no error is currently returned for non-supported link rates.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20221114110621.4639-12-johan+linaro@kernel.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 748fd32a6f72806a82b37434042bd110c1abeab3..c059e4aeecdbf0b1c230a78e63e59be8d77e8644 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
@@ -1313,7 +1313,7 @@ static void qmp_combo_configure(void __iomem *base,
        qmp_combo_configure_lane(base, tbl, num, 0xff);
 }
 
-static int qmp_combo_serdes_init(struct qmp_phy *qphy)
+static int qmp_combo_dp_serdes_init(struct qmp_phy *qphy)
 {
        const struct qmp_phy_cfg *cfg = qphy->cfg;
        void __iomem *serdes = qphy->serdes;
@@ -1323,28 +1323,26 @@ static int qmp_combo_serdes_init(struct qmp_phy *qphy)
 
        qmp_combo_configure(serdes, serdes_tbl, serdes_tbl_num);
 
-       if (cfg->type == PHY_TYPE_DP) {
-               switch (dp_opts->link_rate) {
-               case 1620:
-                       qmp_combo_configure(serdes, cfg->serdes_tbl_rbr,
-                                              cfg->serdes_tbl_rbr_num);
-                       break;
-               case 2700:
-                       qmp_combo_configure(serdes, cfg->serdes_tbl_hbr,
-                                              cfg->serdes_tbl_hbr_num);
-                       break;
-               case 5400:
-                       qmp_combo_configure(serdes, cfg->serdes_tbl_hbr2,
-                                              cfg->serdes_tbl_hbr2_num);
-                       break;
-               case 8100:
-                       qmp_combo_configure(serdes, cfg->serdes_tbl_hbr3,
-                                              cfg->serdes_tbl_hbr3_num);
-                       break;
-               default:
-                       /* Other link rates aren't supported */
-                       return -EINVAL;
-               }
+       switch (dp_opts->link_rate) {
+       case 1620:
+               qmp_combo_configure(serdes, cfg->serdes_tbl_rbr,
+                               cfg->serdes_tbl_rbr_num);
+               break;
+       case 2700:
+               qmp_combo_configure(serdes, cfg->serdes_tbl_hbr,
+                               cfg->serdes_tbl_hbr_num);
+               break;
+       case 5400:
+               qmp_combo_configure(serdes, cfg->serdes_tbl_hbr2,
+                               cfg->serdes_tbl_hbr2_num);
+               break;
+       case 8100:
+               qmp_combo_configure(serdes, cfg->serdes_tbl_hbr3,
+                               cfg->serdes_tbl_hbr3_num);
+               break;
+       default:
+               /* Other link rates aren't supported */
+               return -EINVAL;
        }
 
        return 0;
@@ -1994,7 +1992,7 @@ static int qmp_combo_dp_power_on(struct phy *phy)
        const struct qmp_phy_cfg *cfg = qphy->cfg;
        void __iomem *tx = qphy->tx;
 
-       qmp_combo_serdes_init(qphy);
+       qmp_combo_dp_serdes_init(qphy);
 
        qmp_combo_configure_lane(tx, cfg->tx_tbl, cfg->tx_tbl_num, 1);
 
@@ -2025,6 +2023,7 @@ static int qmp_combo_usb_power_on(struct phy *phy)
        struct qmp_phy *qphy = phy_get_drvdata(phy);
        struct qcom_qmp *qmp = qphy->qmp;
        const struct qmp_phy_cfg *cfg = qphy->cfg;
+       void __iomem *serdes = qphy->serdes;
        void __iomem *tx = qphy->tx;
        void __iomem *rx = qphy->rx;
        void __iomem *pcs = qphy->pcs;
@@ -2032,7 +2031,7 @@ static int qmp_combo_usb_power_on(struct phy *phy)
        unsigned int val;
        int ret;
 
-       qmp_combo_serdes_init(qphy);
+       qmp_combo_configure(serdes, cfg->serdes_tbl, cfg->serdes_tbl_num);
 
        ret = clk_prepare_enable(qphy->pipe_clk);
        if (ret) {