phy: qcom: edp: Add eDP/DP mode switch support

The eDP PHY supports both eDP/DP modes, each requiring a different
swing/pre-emphasis table. However, the driver currently uses a fixed
static table for eDP programming rather than selecting the appropriate
table based on the current mode. Add separate tables for eDP and DP
modes, and select the appropriate table dynamically based on the
current mode.

Glymur's DP mode table differs from the other platforms, add a
dedicated table for it.

This also fixes the table mismatch for X1E80100 (eDP) and SA8775P (DP).

Cc: stable@vger.kernel.org
Fixes: 3f12bf16213c ("phy: qcom: edp: Add support for eDP PHY on SA8775P")
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Yongxing Mou <yongxing.mou@oss.qualcomm.com>
Link: https://patch.msgid.link/20260427-edp_phy-v5-2-3bb876824475@oss.qualcomm.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/qualcomm/phy-qcom-edp.c b/drivers/phy/qualcomm/phy-qcom-edp.c
index 2af3fd63832fb1457fff88a55d74b9bf76fe9193..3266026cfe37212d23296e91ae7f0023c0b8ee22 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-edp.c
+++ b/drivers/phy/qualcomm/phy-qcom-edp.c
@@ -87,7 +87,8 @@ struct qcom_edp_phy_cfg {
        bool is_edp;
        const u8 *aux_cfg;
        const u8 *vco_div_cfg;
-       const struct qcom_edp_swing_pre_emph_cfg *swing_pre_emph_cfg;
+       const struct qcom_edp_swing_pre_emph_cfg *dp_swing_pre_emph_cfg;
+       const struct qcom_edp_swing_pre_emph_cfg *edp_swing_pre_emph_cfg;
        const struct phy_ver_ops *ver_ops;
 };
 
@@ -150,6 +151,20 @@ static const struct qcom_edp_swing_pre_emph_cfg dp_phy_swing_pre_emph_cfg = {
        .pre_emphasis_hbr3_hbr2 = &dp_pre_emp_hbr2_hbr3,
 };
 
+static const u8 dp_pre_emp_hbr_rbr_v8[4][4] = {
+       { 0x00, 0x0e, 0x15, 0x1a },
+       { 0x00, 0x0e, 0x15, 0xff },
+       { 0x00, 0x0e, 0xff, 0xff },
+       { 0x00, 0xff, 0xff, 0xff }
+};
+
+static const struct qcom_edp_swing_pre_emph_cfg dp_phy_swing_pre_emph_cfg_v8 = {
+       .swing_hbr_rbr = &dp_swing_hbr_rbr,
+       .swing_hbr3_hbr2 = &dp_swing_hbr2_hbr3,
+       .pre_emphasis_hbr_rbr = &dp_pre_emp_hbr_rbr_v8,
+       .pre_emphasis_hbr3_hbr2 = &dp_pre_emp_hbr2_hbr3,
+};
+
 static const u8 edp_swing_hbr_rbr[4][4] = {
        { 0x07, 0x0f, 0x16, 0x1f },
        { 0x0d, 0x16, 0x1e, 0xff },
@@ -246,7 +261,7 @@ static int qcom_edp_phy_init(struct phy *phy)
         * when more information becomes available about why this is
         * even needed.
         */
-       if (edp->cfg->swing_pre_emph_cfg && !edp->is_edp)
+       if (edp->cfg->dp_swing_pre_emph_cfg && !edp->is_edp)
                aux_cfg[8] = 0xb7;
 
        writel(0xfc, edp->edp + DP_PHY_MODE);
@@ -270,7 +285,7 @@ out_disable_supplies:
 
 static int qcom_edp_set_voltages(struct qcom_edp *edp, const struct phy_configure_opts_dp *dp_opts)
 {
-       const struct qcom_edp_swing_pre_emph_cfg *cfg = edp->cfg->swing_pre_emph_cfg;
+       const struct qcom_edp_swing_pre_emph_cfg *cfg;
        unsigned int v_level = 0;
        unsigned int p_level = 0;
        u8 ldo_config;
@@ -278,12 +293,14 @@ static int qcom_edp_set_voltages(struct qcom_edp *edp, const struct phy_configur
        u8 emph;
        int i;
 
+       if (edp->is_edp)
+               cfg = edp->cfg->edp_swing_pre_emph_cfg;
+       else
+               cfg = edp->cfg->dp_swing_pre_emph_cfg;
+
        if (!cfg)
                return 0;
 
-       if (edp->is_edp)
-               cfg = &edp_phy_swing_pre_emph_cfg;
-
        for (i = 0; i < dp_opts->lanes; i++) {
                v_level = max(v_level, dp_opts->voltage[i]);
                p_level = max(p_level, dp_opts->pre[i]);
@@ -543,7 +560,8 @@ static const struct qcom_edp_phy_cfg sa8775p_dp_phy_cfg = {
        .is_edp = false,
        .aux_cfg = edp_phy_aux_cfg_v5,
        .vco_div_cfg = edp_phy_vco_div_cfg_v4,
-       .swing_pre_emph_cfg = &edp_phy_swing_pre_emph_cfg,
+       .dp_swing_pre_emph_cfg = &dp_phy_swing_pre_emph_cfg,
+       .edp_swing_pre_emph_cfg = &edp_phy_swing_pre_emph_cfg,
        .ver_ops = &qcom_edp_phy_ops_v4,
 };
 
@@ -556,7 +574,8 @@ static const struct qcom_edp_phy_cfg sc7280_dp_phy_cfg = {
 static const struct qcom_edp_phy_cfg sc8280xp_dp_phy_cfg = {
        .aux_cfg = edp_phy_aux_cfg_v4,
        .vco_div_cfg = edp_phy_vco_div_cfg_v4,
-       .swing_pre_emph_cfg = &dp_phy_swing_pre_emph_cfg,
+       .dp_swing_pre_emph_cfg = &dp_phy_swing_pre_emph_cfg,
+       .edp_swing_pre_emph_cfg = &edp_phy_swing_pre_emph_cfg,
        .ver_ops = &qcom_edp_phy_ops_v4,
 };
 
@@ -564,7 +583,8 @@ static const struct qcom_edp_phy_cfg sc8280xp_edp_phy_cfg = {
        .is_edp = true,
        .aux_cfg = edp_phy_aux_cfg_v4,
        .vco_div_cfg = edp_phy_vco_div_cfg_v4,
-       .swing_pre_emph_cfg = &edp_phy_swing_pre_emph_cfg,
+       .dp_swing_pre_emph_cfg = &dp_phy_swing_pre_emph_cfg,
+       .edp_swing_pre_emph_cfg = &edp_phy_swing_pre_emph_cfg,
        .ver_ops = &qcom_edp_phy_ops_v4,
 };
 
@@ -745,7 +765,8 @@ static const struct phy_ver_ops qcom_edp_phy_ops_v6 = {
 static struct qcom_edp_phy_cfg x1e80100_phy_cfg = {
        .aux_cfg = edp_phy_aux_cfg_v4,
        .vco_div_cfg = edp_phy_vco_div_cfg_v4,
-       .swing_pre_emph_cfg = &dp_phy_swing_pre_emph_cfg,
+       .dp_swing_pre_emph_cfg = &dp_phy_swing_pre_emph_cfg,
+       .edp_swing_pre_emph_cfg = &edp_phy_swing_pre_emph_cfg,
        .ver_ops = &qcom_edp_phy_ops_v6,
 };
 
@@ -924,7 +945,8 @@ static const struct phy_ver_ops qcom_edp_phy_ops_v8 = {
 static struct qcom_edp_phy_cfg glymur_phy_cfg = {
        .aux_cfg = edp_phy_aux_cfg_v8,
        .vco_div_cfg = edp_phy_vco_div_cfg_v8,
-       .swing_pre_emph_cfg = &edp_phy_swing_pre_emph_cfg,
+       .dp_swing_pre_emph_cfg = &dp_phy_swing_pre_emph_cfg_v8,
+       .edp_swing_pre_emph_cfg = &edp_phy_swing_pre_emph_cfg,
        .ver_ops = &qcom_edp_phy_ops_v8,
 };
 
@@ -942,7 +964,7 @@ static int qcom_edp_phy_power_on(struct phy *phy)
        if (ret)
                return ret;
 
-       if (edp->cfg->swing_pre_emph_cfg && !edp->is_edp)
+       if (edp->cfg->edp_swing_pre_emph_cfg && !edp->is_edp)
                ldo_config = 0x1;
 
        writel(ldo_config, edp->tx0 + TXn_LDO_CONFIG);