phy: qcom: qmp-combo: fix sm8650 voltage swing table

The QMP USB3/DP PHY found in the SM8650 SoC requires a slightly
different Voltage Swing table for HBR/RBR link speeds.

Add a new hbr/rbr voltage switch table named "v6" used in a new
sm8650 qmp_phy_cfg struct replacing the sm8550 fallback used for
the sm8650 compatible.

Fixes: 80c1afe8c5fe ("phy: qcom: qmp-combo: add QMP USB3/DP PHY tables for SM8650")
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20240226-topic-sm8650-upstream-combo-phy-swing-update-v1-1-08707ebca92a@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 ea2d5369534d4b31ccccba5010119eec71c1e5fc..9fd921d714574204813207512c54cac7e48ab119 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
@@ -1377,6 +1377,13 @@ static const u8 qmp_dp_v5_voltage_swing_hbr_rbr[4][4] = {
        { 0x3f, 0xff, 0xff, 0xff }
 };
 
+static const u8 qmp_dp_v6_voltage_swing_hbr_rbr[4][4] = {
+       { 0x27, 0x2f, 0x36, 0x3f },
+       { 0x31, 0x3e, 0x3f, 0xff },
+       { 0x36, 0x3f, 0xff, 0xff },
+       { 0x3f, 0xff, 0xff, 0xff }
+};
+
 static const u8 qmp_dp_v6_pre_emphasis_hbr_rbr[4][4] = {
        { 0x20, 0x2d, 0x34, 0x3a },
        { 0x20, 0x2e, 0x35, 0xff },
@@ -1996,6 +2003,51 @@ static const struct qmp_phy_cfg sm8550_usb3dpphy_cfg = {
        .num_vregs              = ARRAY_SIZE(qmp_phy_vreg_l),
 };
 
+static const struct qmp_phy_cfg sm8650_usb3dpphy_cfg = {
+       .offsets                = &qmp_combo_offsets_v3,
+
+       .serdes_tbl             = sm8550_usb3_serdes_tbl,
+       .serdes_tbl_num         = ARRAY_SIZE(sm8550_usb3_serdes_tbl),
+       .tx_tbl                 = sm8550_usb3_tx_tbl,
+       .tx_tbl_num             = ARRAY_SIZE(sm8550_usb3_tx_tbl),
+       .rx_tbl                 = sm8550_usb3_rx_tbl,
+       .rx_tbl_num             = ARRAY_SIZE(sm8550_usb3_rx_tbl),
+       .pcs_tbl                = sm8550_usb3_pcs_tbl,
+       .pcs_tbl_num            = ARRAY_SIZE(sm8550_usb3_pcs_tbl),
+       .pcs_usb_tbl            = sm8550_usb3_pcs_usb_tbl,
+       .pcs_usb_tbl_num        = ARRAY_SIZE(sm8550_usb3_pcs_usb_tbl),
+
+       .dp_serdes_tbl          = qmp_v6_dp_serdes_tbl,
+       .dp_serdes_tbl_num      = ARRAY_SIZE(qmp_v6_dp_serdes_tbl),
+       .dp_tx_tbl              = qmp_v6_dp_tx_tbl,
+       .dp_tx_tbl_num          = ARRAY_SIZE(qmp_v6_dp_tx_tbl),
+
+       .serdes_tbl_rbr         = qmp_v6_dp_serdes_tbl_rbr,
+       .serdes_tbl_rbr_num     = ARRAY_SIZE(qmp_v6_dp_serdes_tbl_rbr),
+       .serdes_tbl_hbr         = qmp_v6_dp_serdes_tbl_hbr,
+       .serdes_tbl_hbr_num     = ARRAY_SIZE(qmp_v6_dp_serdes_tbl_hbr),
+       .serdes_tbl_hbr2        = qmp_v6_dp_serdes_tbl_hbr2,
+       .serdes_tbl_hbr2_num    = ARRAY_SIZE(qmp_v6_dp_serdes_tbl_hbr2),
+       .serdes_tbl_hbr3        = qmp_v6_dp_serdes_tbl_hbr3,
+       .serdes_tbl_hbr3_num    = ARRAY_SIZE(qmp_v6_dp_serdes_tbl_hbr3),
+
+       .swing_hbr_rbr          = &qmp_dp_v6_voltage_swing_hbr_rbr,
+       .pre_emphasis_hbr_rbr   = &qmp_dp_v6_pre_emphasis_hbr_rbr,
+       .swing_hbr3_hbr2        = &qmp_dp_v5_voltage_swing_hbr3_hbr2,
+       .pre_emphasis_hbr3_hbr2 = &qmp_dp_v5_pre_emphasis_hbr3_hbr2,
+
+       .dp_aux_init            = qmp_v4_dp_aux_init,
+       .configure_dp_tx        = qmp_v4_configure_dp_tx,
+       .configure_dp_phy       = qmp_v4_configure_dp_phy,
+       .calibrate_dp_phy       = qmp_v4_calibrate_dp_phy,
+
+       .regs                   = qmp_v6_usb3phy_regs_layout,
+       .reset_list             = msm8996_usb3phy_reset_l,
+       .num_resets             = ARRAY_SIZE(msm8996_usb3phy_reset_l),
+       .vreg_list              = qmp_phy_vreg_l,
+       .num_vregs              = ARRAY_SIZE(qmp_phy_vreg_l),
+};
+
 static int qmp_combo_dp_serdes_init(struct qmp_combo *qmp)
 {
        const struct qmp_phy_cfg *cfg = qmp->cfg;
@@ -3623,7 +3675,7 @@ static const struct of_device_id qmp_combo_of_match_table[] = {
        },
        {
                .compatible = "qcom,sm8650-qmp-usb3-dp-phy",
-               .data = &sm8550_usb3dpphy_cfg,
+               .data = &sm8650_usb3dpphy_cfg,
        },
        {
                .compatible = "qcom,x1e80100-qmp-usb3-dp-phy",