The PHY is based on a Samsung IP block that supports HDMI 2.1, and eDP
1.4b. RK3588 integrates the Analogix eDP 1.3 TX controller IP and the
HDMI/eDP TX Combo PHY to support eDP display.

Add basic support for RBR/HBR/HBR2 link rates, and the voltage swing and
pre-emphasis configurations of each link rate are set according to the
eDP 1.3 requirements.

Signed-off-by: Damon Ding <damon.d...@rock-chips.com>
Reviewed-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
---
 .../phy/rockchip/phy-rockchip-samsung-hdptx.c | 879 +++++++++++++++++-
 1 file changed, 869 insertions(+), 10 deletions(-)

diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c 
b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
index 5aec854c74b5..e318a46b8be2 100644
--- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
+++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c
@@ -25,6 +25,7 @@
 #define HDPTX_I_PLL_EN                 BIT(7)
 #define HDPTX_I_BIAS_EN                        BIT(6)
 #define HDPTX_I_BGR_EN                 BIT(5)
+#define HDPTX_MODE_SEL                 BIT(0)
 #define GRF_HDPTX_STATUS               0x80
 #define HDPTX_O_PLL_LOCK_DONE          BIT(3)
 #define HDPTX_O_PHY_CLK_RDY            BIT(2)
@@ -44,6 +45,7 @@
 #define LANE_REG(n)                    HDTPX_REG(n, 0300, 062d)
 
 /* CMN_REG(0008) */
+#define OVRD_LCPLL_EN_MASK             BIT(7)
 #define LCPLL_EN_MASK                  BIT(6)
 #define LCPLL_LCVCO_MODE_EN_MASK       BIT(4)
 /* CMN_REG(001e) */
@@ -61,28 +63,88 @@
 /* CMN_REG(002f) */
 #define LCPLL_SDC_DENOMINATOR_MASK     GENMASK(7, 2)
 #define LCPLL_SDC_NDIV_RSTN_MASK       BIT(0)
+/* CMN_REG(003c) */
+#define ANA_LCPLL_RESERVED7_MASK       BIT(7)
 /* CMN_REG(003d) */
+#define OVRD_ROPLL_EN_MASK             BIT(7)
+#define ROPLL_EN_MASK                  BIT(6)
 #define ROPLL_LCVCO_EN_MASK            BIT(4)
+/* CMN_REG(0046) */
+#define ROPLL_ANA_CPP_CTRL_COARSE_MASK GENMASK(7, 4)
+#define ROPLL_ANA_CPP_CTRL_FINE_MASK   GENMASK(3, 0)
+/* CMN_REG(0047) */
+#define ROPLL_ANA_LPF_C_SEL_COARSE_MASK        GENMASK(5, 3)
+#define ROPLL_ANA_LPF_C_SEL_FINE_MASK  GENMASK(2, 0)
 /* CMN_REG(004e) */
 #define ROPLL_PI_EN_MASK               BIT(5)
+/* CMN_REG(0051) */
+#define ROPLL_PMS_MDIV_MASK            GENMASK(7, 0)
+/* CMN_REG(0055) */
+#define ROPLL_PMS_MDIV_AFC_MASK                GENMASK(7, 0)
+/* CMN_REG(0059) */
+#define ANA_ROPLL_PMS_PDIV_MASK                GENMASK(7, 4)
+#define ANA_ROPLL_PMS_REFDIV_MASK      GENMASK(3, 0)
+/* CMN_REG(005a) */
+#define ROPLL_PMS_SDIV_RBR_MASK                GENMASK(7, 4)
+#define ROPLL_PMS_SDIV_HBR_MASK                GENMASK(3, 0)
+/* CMN_REG(005b) */
+#define ROPLL_PMS_SDIV_HBR2_MASK       GENMASK(7, 4)
 /* CMN_REG(005c) */
 #define ROPLL_PMS_IQDIV_RSTN_MASK      BIT(5)
 /* CMN_REG(005e) */
 #define ROPLL_SDM_EN_MASK              BIT(6)
+#define OVRD_ROPLL_SDM_RSTN_MASK       BIT(5)
+#define ROPLL_SDM_RSTN_MASK            BIT(4)
 #define ROPLL_SDC_FRAC_EN_RBR_MASK     BIT(3)
 #define ROPLL_SDC_FRAC_EN_HBR_MASK     BIT(2)
 #define ROPLL_SDC_FRAC_EN_HBR2_MASK    BIT(1)
 #define ROPLL_SDM_FRAC_EN_HBR3_MASK    BIT(0)
+/* CMN_REG(005f) */
+#define OVRD_ROPLL_SDC_RSTN_MASK       BIT(5)
+#define ROPLL_SDC_RSTN_MASK            BIT(4)
+/* CMN_REG(0060)  */
+#define ROPLL_SDM_DENOMINATOR_MASK     GENMASK(7, 0)
 /* CMN_REG(0064) */
 #define ROPLL_SDM_NUM_SIGN_RBR_MASK    BIT(3)
+#define ROPLL_SDM_NUM_SIGN_HBR_MASK    BIT(2)
+#define ROPLL_SDM_NUM_SIGN_HBR2_MASK   BIT(1)
+/* CMN_REG(0065) */
+#define ROPLL_SDM_NUM_MASK             GENMASK(7, 0)
 /* CMN_REG(0069) */
 #define ROPLL_SDC_N_RBR_MASK           GENMASK(2, 0)
+/* CMN_REG(006a) */
+#define ROPLL_SDC_N_HBR_MASK           GENMASK(5, 3)
+#define ROPLL_SDC_N_HBR2_MASK          GENMASK(2, 0)
+/* CMN_REG(006b) */
+#define ROPLL_SDC_N_HBR3_MASK          GENMASK(3, 1)
+/* CMN_REG(006c) */
+#define ROPLL_SDC_NUM_MASK             GENMASK(5, 0)
+/* cmn_reg0070 */
+#define ROPLL_SDC_DENO_MASK            GENMASK(5, 0)
 /* CMN_REG(0074) */
+#define OVRD_ROPLL_SDC_NDIV_RSTN_MASK  BIT(3)
 #define ROPLL_SDC_NDIV_RSTN_MASK       BIT(2)
+#define OVRD_ROPLL_SSC_EN_MASK         BIT(1)
 #define ROPLL_SSC_EN_MASK              BIT(0)
+/* CMN_REG(0075) */
+#define ANA_ROPLL_SSC_FM_DEVIATION_MASK        GENMASK(5, 0)
+/* CMN_REG(0076) */
+#define ANA_ROPLL_SSC_FM_FREQ_MASK     GENMASK(6, 2)
+/* CMN_REG(0077) */
+#define ANA_ROPLL_SSC_CLK_DIV_SEL_MASK GENMASK(6, 3)
 /* CMN_REG(0081) */
 #define OVRD_PLL_CD_CLK_EN_MASK                BIT(8)
+#define ANA_PLL_CD_TX_SER_RATE_SEL_MASK        BIT(3)
+#define ANA_PLL_CD_HSCLK_WEST_EN_MASK  BIT(1)
 #define ANA_PLL_CD_HSCLK_EAST_EN_MASK  BIT(0)
+/* CMN_REG(0082) */
+#define ANA_PLL_CD_VREG_GAIN_CTRL_MASK GENMASK(3, 0)
+/* CMN_REG(0083) */
+#define ANA_PLL_CD_VREG_ICTRL_MASK     GENMASK(6, 5)
+/* CMN_REG(0084) */
+#define PLL_LCRO_CLK_SEL_MASK          BIT(5)
+/* CMN_REG(0085) */
+#define ANA_PLL_SYNC_LOSS_DET_MODE_MASK        GENMASK(1, 0)
 /* CMN_REG(0086) */
 #define PLL_PCG_POSTDIV_SEL_MASK       GENMASK(7, 4)
 #define PLL_PCG_CLK_SEL_MASK           GENMASK(3, 1)
@@ -92,11 +154,14 @@
 #define ANA_PLL_TX_HS_CLK_EN_MASK      BIT(2)
 /* CMN_REG(0089) */
 #define LCPLL_ALONE_MODE_MASK          BIT(1)
+/* CMN_REG(0095) */
+#define DP_TX_LINK_BW_MASK             GENMASK(1, 0)
 /* CMN_REG(0097) */
 #define DIG_CLK_SEL_MASK               BIT(1)
 #define LCPLL_REF                      BIT(1)
 #define ROPLL_REF                      0
 /* CMN_REG(0099) */
+#define SSC_EN_MASK                    GENMASK(7, 6)
 #define CMN_ROPLL_ALONE_MODE_MASK      BIT(2)
 #define ROPLL_ALONE_MODE               BIT(2)
 /* CMN_REG(009a) */
@@ -118,6 +183,8 @@
 /* SB_REG(0104) */
 #define OVRD_SB_EN_MASK                        BIT(5)
 #define SB_EN_MASK                     BIT(4)
+#define OVRD_SB_AUX_EN_MASK            BIT(1)
+#define SB_AUX_EN_MASK                 BIT(0)
 /* SB_REG(0105) */
 #define OVRD_SB_EARC_CMDC_EN_MASK      BIT(6)
 #define SB_EARC_CMDC_EN_MASK           BIT(5)
@@ -126,6 +193,8 @@
 #define ANA_SB_TX_LLVL_PROG_MASK       GENMASK(6, 4)
 /* SB_REG(0109) */
 #define ANA_SB_DMRX_AFC_DIV_RATIO_MASK GENMASK(2, 0)
+/* SB_REG(010d) */
+#define ANA_SB_DMRX_LPBK_DATA_MASK     BIT(4)
 /* SB_REG(010f) */
 #define OVRD_SB_VREG_EN_MASK           BIT(7)
 #define SB_VREG_EN_MASK                        BIT(6)
@@ -133,6 +202,7 @@
 #define SB_VREG_LPF_BYPASS_MASK                BIT(4)
 #define ANA_SB_VREG_GAIN_CTRL_MASK     GENMASK(3, 0)
 /* SB_REG(0110) */
+#define ANA_SB_VREG_OUT_SEL_MASK       BIT(1)
 #define ANA_SB_VREG_REF_SEL_MASK       BIT(0)
 /* SB_REG(0113) */
 #define SB_RX_RCAL_OPT_CODE_MASK       GENMASK(5, 4)
@@ -147,13 +217,24 @@
 #define AFC_RSTN_DELAY_TIME_MASK       GENMASK(6, 4)
 /* SB_REG(0117) */
 #define FAST_PULSE_TIME_MASK           GENMASK(3, 0)
+/* SB_REG(0118) */
+#define SB_TG_EARC_DMRX_RECVRD_CLK_CNT_MASK    GENMASK(7, 0)
+/* SB_REG(011a) */
+#define SB_TG_CNT_RUN_NO_7_0_MASK      GENMASK(7, 0)
 /* SB_REG(011b) */
 #define SB_EARC_SIG_DET_BYPASS_MASK    BIT(4)
 #define SB_AFC_TOL_MASK                        GENMASK(3, 0)
+/* SB_REG(011c) */
+#define SB_AFC_STB_NUM_MASK            GENMASK(3, 0)
+/* SB_REG(011d) */
+#define SB_TG_OSC_CNT_MIN_MASK         GENMASK(7, 0)
+/* SB_REG(011e) */
+#define SB_TG_OSC_CNT_MAX_MASK         GENMASK(7, 0)
 /* SB_REG(011f) */
 #define SB_PWM_AFC_CTRL_MASK           GENMASK(7, 2)
 #define SB_RCAL_RSTN_MASK              BIT(1)
 /* SB_REG(0120) */
+#define SB_AUX_EN_IN_MASK              BIT(7)
 #define SB_EARC_EN_MASK                        BIT(1)
 #define SB_EARC_AFC_EN_MASK            BIT(2)
 /* SB_REG(0123) */
@@ -165,27 +246,74 @@
 #define HDMI_MODE                      BIT(2)
 #define HDMI_TMDS_FRL_SEL              BIT(1)
 /* LNTOP_REG(0206) */
+#define DATA_BUS_WIDTH_MASK            GENMASK(2, 1)
 #define DATA_BUS_WIDTH_SEL_MASK                BIT(0)
 #define DATA_BUS_36_40                 BIT(0)
 /* LNTOP_REG(0207) */
 #define LANE_EN_MASK                   0xf
 #define ALL_LANE_EN                    0xf
 
+/* LANE_REG(0301) */
+#define OVRD_LN_TX_DRV_EI_EN_MASK      BIT(7)
+#define LN_TX_DRV_EI_EN_MASK           BIT(6)
+/* LANE_REG(0303) */
+#define OVRD_LN_TX_DRV_LVL_CTRL_MASK   BIT(5)
+#define LN_TX_DRV_LVL_CTRL_MASK                GENMASK(4, 0)
+/* LANE_REG(0304)  */
+#define OVRD_LN_TX_DRV_POST_LVL_CTRL_MASK      BIT(4)
+#define LN_TX_DRV_POST_LVL_CTRL_MASK   GENMASK(3, 0)
+/* LANE_REG(0305) */
+#define OVRD_LN_TX_DRV_PRE_LVL_CTRL_MASK       BIT(6)
+#define LN_TX_DRV_PRE_LVL_CTRL_MASK    GENMASK(5, 2)
+/* LANE_REG(0306) */
+#define LN_ANA_TX_DRV_IDRV_IDN_CTRL_MASK       GENMASK(7, 5)
+#define LN_ANA_TX_DRV_IDRV_IUP_CTRL_MASK       GENMASK(4, 2)
+#define LN_ANA_TX_DRV_ACCDRV_EN_MASK   BIT(0)
+/* LANE_REG(0307) */
+#define LN_ANA_TX_DRV_ACCDRV_POL_SEL_MASK      BIT(6)
+#define LN_ANA_TX_DRV_ACCDRV_CTRL_MASK GENMASK(5, 3)
+/* LANE_REG(030a) */
+#define LN_ANA_TX_JEQ_EN_MASK          BIT(4)
+#define LN_TX_JEQ_EVEN_CTRL_RBR_MASK   GENMASK(3, 0)
+/* LANE_REG(030b) */
+#define LN_TX_JEQ_EVEN_CTRL_HBR_MASK   GENMASK(7, 4)
+#define LN_TX_JEQ_EVEN_CTRL_HBR2_MASK  GENMASK(3, 0)
+/* LANE_REG(030c) */
+#define LN_TX_JEQ_ODD_CTRL_RBR_MASK    GENMASK(3, 0)
+/* LANE_REG(030d) */
+#define LN_TX_JEQ_ODD_CTRL_HBR_MASK    GENMASK(7, 4)
+#define LN_TX_JEQ_ODD_CTRL_HBR2_MASK   GENMASK(3, 0)
+/* LANE_REG(0310) */
+#define LN_ANA_TX_SYNC_LOSS_DET_MODE_MASK      GENMASK(1, 0)
+/* LANE_REG(0311) */
+#define LN_TX_SER_40BIT_EN_RBR_MASK    BIT(3)
+#define LN_TX_SER_40BIT_EN_HBR_MASK    BIT(2)
+#define LN_TX_SER_40BIT_EN_HBR2_MASK   BIT(1)
 /* LANE_REG(0312) */
 #define LN0_TX_SER_RATE_SEL_RBR_MASK   BIT(5)
 #define LN0_TX_SER_RATE_SEL_HBR_MASK   BIT(4)
 #define LN0_TX_SER_RATE_SEL_HBR2_MASK  BIT(3)
 #define LN0_TX_SER_RATE_SEL_HBR3_MASK  BIT(2)
+/* LANE_REG(0316) */
+#define LN_ANA_TX_SER_VREG_GAIN_CTRL_MASK      GENMASK(3, 0)
+/* LANE_REG(031B) */
+#define LN_ANA_TX_RESERVED_MASK                GENMASK(7, 0)
+/* LANE_REG(031e) */
+#define LN_POLARITY_INV_MASK           BIT(2)
+#define LN_LANE_MODE_MASK              BIT(1)
+
 /* LANE_REG(0412) */
 #define LN1_TX_SER_RATE_SEL_RBR_MASK   BIT(5)
 #define LN1_TX_SER_RATE_SEL_HBR_MASK   BIT(4)
 #define LN1_TX_SER_RATE_SEL_HBR2_MASK  BIT(3)
 #define LN1_TX_SER_RATE_SEL_HBR3_MASK  BIT(2)
+
 /* LANE_REG(0512) */
 #define LN2_TX_SER_RATE_SEL_RBR_MASK   BIT(5)
 #define LN2_TX_SER_RATE_SEL_HBR_MASK   BIT(4)
 #define LN2_TX_SER_RATE_SEL_HBR2_MASK  BIT(3)
 #define LN2_TX_SER_RATE_SEL_HBR3_MASK  BIT(2)
+
 /* LANE_REG(0612) */
 #define LN3_TX_SER_RATE_SEL_RBR_MASK   BIT(5)
 #define LN3_TX_SER_RATE_SEL_HBR_MASK   BIT(4)
@@ -194,6 +322,12 @@
 
 #define HDMI20_MAX_RATE                        600000000
 
+enum dp_link_rate {
+       DP_BW_RBR,
+       DP_BW_HBR,
+       DP_BW_HBR2,
+};
+
 struct lcpll_config {
        u32 bit_rate;
        u8 lcvco_mode_en;
@@ -255,6 +389,19 @@ struct ropll_config {
        u8 cd_tx_ser_rate_sel;
 };
 
+struct tx_drv_ctrl {
+       u8 tx_drv_lvl_ctrl;
+       u8 tx_drv_post_lvl_ctrl;
+       u8 ana_tx_drv_idrv_idn_ctrl;
+       u8 ana_tx_drv_idrv_iup_ctrl;
+       u8 ana_tx_drv_accdrv_en;
+       u8 ana_tx_drv_accdrv_ctrl;
+       u8 tx_drv_pre_lvl_ctrl;
+       u8 ana_tx_jeq_en;
+       u8 tx_jeq_even_ctrl;
+       u8 tx_jeq_odd_ctrl;
+};
+
 enum rk_hdptx_reset {
        RST_APB = 0,
        RST_INIT,
@@ -279,6 +426,10 @@ struct rk_hdptx_phy {
        unsigned long rate;
 
        atomic_t usage_count;
+
+       /* used for dp mode */
+       unsigned int link_rate;
+       unsigned int lanes;
 };
 
 static const struct ropll_config ropll_tmds_cfg[] = {
@@ -557,6 +708,90 @@ static const struct reg_sequence 
rk_hdtpx_tmds_lane_init_seq[] = {
        REG_SEQ0(LANE_REG(0606), 0x1c),
 };
 
+static struct tx_drv_ctrl tx_drv_ctrl_rbr[4][4] = {
+       /* voltage swing 0, pre-emphasis 0->3 */
+       {
+               { 0x2, 0x0, 0x4, 0x6, 0x0, 0x4, 0x1, 0x1, 0x7, 0x7 },
+               { 0x4, 0x3, 0x4, 0x6, 0x0, 0x4, 0x0, 0x1, 0x7, 0x7 },
+               { 0x7, 0x6, 0x4, 0x6, 0x0, 0x4, 0x0, 0x1, 0x7, 0x7 },
+               { 0xd, 0xc, 0x7, 0x7, 0x1, 0x7, 0x0, 0x1, 0x7, 0x7 },
+       },
+
+       /* voltage swing 1, pre-emphasis 0->2 */
+       {
+               { 0x4, 0x0, 0x4, 0x6, 0x0, 0x4, 0x1, 0x1, 0x7, 0x7 },
+               { 0x9, 0x5, 0x4, 0x6, 0x0, 0x4, 0x0, 0x1, 0x7, 0x7 },
+               { 0xc, 0x8, 0x7, 0x7, 0x1, 0x7, 0x0, 0x1, 0x7, 0x7 },
+       },
+
+       /* voltage swing 2, pre-emphasis 0->1 */
+       {
+               { 0x8, 0x0, 0x4, 0x6, 0x0, 0x4, 0x1, 0x1, 0x7, 0x7 },
+               { 0xc, 0x5, 0x7, 0x7, 0x1, 0x7, 0x0, 0x1, 0x7, 0x7 },
+       },
+
+       /* voltage swing 3, pre-emphasis 0 */
+       {
+               { 0xb, 0x0, 0x7, 0x7, 0x1, 0x4, 0x1, 0x1, 0x7, 0x7 },
+       }
+};
+
+static struct tx_drv_ctrl tx_drv_ctrl_hbr[4][4] = {
+       /* voltage swing 0, pre-emphasis 0->3 */
+       {
+               { 0x2, 0x0, 0x4, 0x6, 0x0, 0x4, 0x1, 0x1, 0x7, 0x7 },
+               { 0x5, 0x4, 0x4, 0x6, 0x0, 0x4, 0x0, 0x1, 0x7, 0x7 },
+               { 0x9, 0x8, 0x4, 0x6, 0x0, 0x4, 0x0, 0x1, 0x7, 0x7 },
+               { 0xd, 0xc, 0x7, 0x7, 0x1, 0x7, 0x0, 0x1, 0x7, 0x7 },
+       },
+
+       /* voltage swing 1, pre-emphasis 0->2 */
+       {
+               { 0x6, 0x1, 0x4, 0x6, 0x0, 0x4, 0x1, 0x1, 0x7, 0x7 },
+               { 0xa, 0x6, 0x4, 0x6, 0x0, 0x4, 0x0, 0x1, 0x7, 0x7 },
+               { 0xc, 0x8, 0x7, 0x7, 0x1, 0x7, 0x0, 0x1, 0x7, 0x7 },
+       },
+
+       /* voltage swing 2, pre-emphasis 0->1 */
+       {
+               { 0x9, 0x1, 0x4, 0x6, 0x0, 0x4, 0x1, 0x1, 0x7, 0x7 },
+               { 0xd, 0x6, 0x7, 0x7, 0x1, 0x7, 0x0, 0x1, 0x7, 0x7 },
+       },
+
+       /* voltage swing 3, pre-emphasis 0 */
+       {
+               { 0xc, 0x1, 0x7, 0x7, 0x1, 0x4, 0x1, 0x1, 0x7, 0x7 },
+       }
+};
+
+static struct tx_drv_ctrl tx_drv_ctrl_hbr2[4][4] = {
+       /* voltage swing 0, pre-emphasis 0->3 */
+       {
+               { 0x2, 0x1, 0x4, 0x6, 0x0, 0x4, 0x0, 0x1, 0x7, 0x7 },
+               { 0x5, 0x4, 0x4, 0x6, 0x0, 0x4, 0x0, 0x1, 0x7, 0x7 },
+               { 0x9, 0x8, 0x4, 0x6, 0x1, 0x4, 0x0, 0x1, 0x7, 0x7 },
+               { 0xd, 0xc, 0x7, 0x7, 0x1, 0x7, 0x0, 0x1, 0x7, 0x7 },
+       },
+
+       /* voltage swing 1, pre-emphasis 0->2 */
+       {
+               { 0x6, 0x1, 0x4, 0x6, 0x0, 0x4, 0x1, 0x1, 0x7, 0x7 },
+               { 0xb, 0x7, 0x4, 0x6, 0x0, 0x4, 0x0, 0x1, 0x7, 0x7 },
+               { 0xd, 0x9, 0x7, 0x7, 0x1, 0x7, 0x0, 0x1, 0x7, 0x7 },
+       },
+
+       /* voltage swing 2, pre-emphasis 0->1 */
+       {
+               { 0x8, 0x1, 0x4, 0x6, 0x0, 0x4, 0x1, 0x1, 0x7, 0x7 },
+               { 0xc, 0x6, 0x7, 0x7, 0x1, 0x7, 0x0, 0x1, 0x7, 0x7 },
+       },
+
+       /* voltage swing 3, pre-emphasis 0 */
+       {
+               { 0xb, 0x0, 0x7, 0x7, 0x1, 0x4, 0x1, 0x1, 0x7, 0x7 },
+       }
+};
+
 static bool rk_hdptx_phy_is_rw_reg(struct device *dev, unsigned int reg)
 {
        switch (reg) {
@@ -843,9 +1078,45 @@ static int rk_hdptx_ropll_tmds_mode_config(struct 
rk_hdptx_phy *hdptx,
        return rk_hdptx_post_enable_lane(hdptx);
 }
 
+static void rk_hdptx_dp_reset(struct rk_hdptx_phy *hdptx)
+{
+       reset_control_assert(hdptx->rsts[RST_LANE].rstc);
+       reset_control_assert(hdptx->rsts[RST_CMN].rstc);
+       reset_control_assert(hdptx->rsts[RST_INIT].rstc);
+
+       reset_control_assert(hdptx->rsts[RST_APB].rstc);
+       udelay(10);
+       reset_control_deassert(hdptx->rsts[RST_APB].rstc);
+
+       regmap_update_bits(hdptx->regmap, LANE_REG(0301),
+                          OVRD_LN_TX_DRV_EI_EN_MASK | LN_TX_DRV_EI_EN_MASK,
+                          FIELD_PREP(OVRD_LN_TX_DRV_EI_EN_MASK, 1) |
+                          FIELD_PREP(LN_TX_DRV_EI_EN_MASK, 0));
+       regmap_update_bits(hdptx->regmap, LANE_REG(0401),
+                          OVRD_LN_TX_DRV_EI_EN_MASK | LN_TX_DRV_EI_EN_MASK,
+                          FIELD_PREP(OVRD_LN_TX_DRV_EI_EN_MASK, 1) |
+                          FIELD_PREP(LN_TX_DRV_EI_EN_MASK, 0));
+       regmap_update_bits(hdptx->regmap, LANE_REG(0501),
+                          OVRD_LN_TX_DRV_EI_EN_MASK | LN_TX_DRV_EI_EN_MASK,
+                          FIELD_PREP(OVRD_LN_TX_DRV_EI_EN_MASK, 1) |
+                          FIELD_PREP(LN_TX_DRV_EI_EN_MASK, 0));
+       regmap_update_bits(hdptx->regmap, LANE_REG(0601),
+                          OVRD_LN_TX_DRV_EI_EN_MASK | LN_TX_DRV_EI_EN_MASK,
+                          FIELD_PREP(OVRD_LN_TX_DRV_EI_EN_MASK, 1) |
+                          FIELD_PREP(LN_TX_DRV_EI_EN_MASK, 0));
+
+       regmap_write(hdptx->grf, GRF_HDPTX_CON0,
+                    HDPTX_I_PLL_EN << 16 | FIELD_PREP(HDPTX_I_PLL_EN, 0x0));
+       regmap_write(hdptx->grf, GRF_HDPTX_CON0,
+                    HDPTX_I_BIAS_EN << 16 | FIELD_PREP(HDPTX_I_BIAS_EN, 0x0));
+       regmap_write(hdptx->grf, GRF_HDPTX_CON0,
+                    HDPTX_I_BGR_EN << 16 | FIELD_PREP(HDPTX_I_BGR_EN, 0x0));
+}
+
 static int rk_hdptx_phy_consumer_get(struct rk_hdptx_phy *hdptx,
                                     unsigned int rate)
 {
+       enum phy_mode mode = phy_get_mode(hdptx->phy);
        u32 status;
        int ret;
 
@@ -859,10 +1130,14 @@ static int rk_hdptx_phy_consumer_get(struct rk_hdptx_phy 
*hdptx,
        if (status & HDPTX_O_PLL_LOCK_DONE)
                dev_warn(hdptx->dev, "PLL locked by unknown consumer!\n");
 
-       if (rate) {
-               ret = rk_hdptx_ropll_tmds_cmn_config(hdptx, rate);
-               if (ret)
-                       goto dec_usage;
+       if (mode == PHY_MODE_DP) {
+               rk_hdptx_dp_reset(hdptx);
+       } else {
+               if (rate) {
+                       ret = rk_hdptx_ropll_tmds_cmn_config(hdptx, rate);
+                       if (ret)
+                               goto dec_usage;
+               }
        }
 
        return 0;
@@ -874,6 +1149,7 @@ static int rk_hdptx_phy_consumer_get(struct rk_hdptx_phy 
*hdptx,
 
 static int rk_hdptx_phy_consumer_put(struct rk_hdptx_phy *hdptx, bool force)
 {
+       enum phy_mode mode = phy_get_mode(hdptx->phy);
        u32 status;
        int ret;
 
@@ -887,8 +1163,12 @@ static int rk_hdptx_phy_consumer_put(struct rk_hdptx_phy 
*hdptx, bool force)
        } else {
                ret = regmap_read(hdptx->grf, GRF_HDPTX_STATUS, &status);
                if (!ret) {
-                       if (status & HDPTX_O_PLL_LOCK_DONE)
-                               rk_hdptx_phy_disable(hdptx);
+                       if (status & HDPTX_O_PLL_LOCK_DONE) {
+                               if (mode == PHY_MODE_DP)
+                                       rk_hdptx_dp_reset(hdptx);
+                               else
+                                       rk_hdptx_phy_disable(hdptx);
+                       }
                        return 0;
                } else if (force) {
                        return 0;
@@ -899,11 +1179,262 @@ static int rk_hdptx_phy_consumer_put(struct 
rk_hdptx_phy *hdptx, bool force)
        return ret;
 }
 
+static void rk_hdptx_dp_pll_init(struct rk_hdptx_phy *hdptx)
+{
+       regmap_update_bits(hdptx->regmap, CMN_REG(003c), 
ANA_LCPLL_RESERVED7_MASK,
+                          FIELD_PREP(ANA_LCPLL_RESERVED7_MASK, 0x1));
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(0046),
+                          ROPLL_ANA_CPP_CTRL_COARSE_MASK | 
ROPLL_ANA_CPP_CTRL_FINE_MASK,
+                          FIELD_PREP(ROPLL_ANA_CPP_CTRL_COARSE_MASK, 0xe) |
+                          FIELD_PREP(ROPLL_ANA_CPP_CTRL_FINE_MASK, 0xe));
+       regmap_update_bits(hdptx->regmap, CMN_REG(0047),
+                          ROPLL_ANA_LPF_C_SEL_COARSE_MASK |
+                          ROPLL_ANA_LPF_C_SEL_FINE_MASK,
+                          FIELD_PREP(ROPLL_ANA_LPF_C_SEL_COARSE_MASK, 0x4) |
+                          FIELD_PREP(ROPLL_ANA_LPF_C_SEL_FINE_MASK, 0x4));
+
+       regmap_write(hdptx->regmap, CMN_REG(0051), 
FIELD_PREP(ROPLL_PMS_MDIV_MASK, 0x87));
+       regmap_write(hdptx->regmap, CMN_REG(0052), 
FIELD_PREP(ROPLL_PMS_MDIV_MASK, 0x71));
+       regmap_write(hdptx->regmap, CMN_REG(0053), 
FIELD_PREP(ROPLL_PMS_MDIV_MASK, 0x71));
+
+       regmap_write(hdptx->regmap, CMN_REG(0055),
+                    FIELD_PREP(ROPLL_PMS_MDIV_AFC_MASK, 0x87));
+       regmap_write(hdptx->regmap, CMN_REG(0056),
+                    FIELD_PREP(ROPLL_PMS_MDIV_AFC_MASK, 0x71));
+       regmap_write(hdptx->regmap, CMN_REG(0057),
+                    FIELD_PREP(ROPLL_PMS_MDIV_AFC_MASK, 0x71));
+
+       regmap_write(hdptx->regmap, CMN_REG(0059),
+                    FIELD_PREP(ANA_ROPLL_PMS_PDIV_MASK, 0x1) |
+                    FIELD_PREP(ANA_ROPLL_PMS_REFDIV_MASK, 0x1));
+       regmap_write(hdptx->regmap, CMN_REG(005a),
+                    FIELD_PREP(ROPLL_PMS_SDIV_RBR_MASK, 0x3) |
+                    FIELD_PREP(ROPLL_PMS_SDIV_HBR_MASK, 0x1));
+       regmap_update_bits(hdptx->regmap, CMN_REG(005b), 
ROPLL_PMS_SDIV_HBR2_MASK,
+                          FIELD_PREP(ROPLL_PMS_SDIV_HBR2_MASK, 0x0));
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(005e), ROPLL_SDM_EN_MASK,
+                          FIELD_PREP(ROPLL_SDM_EN_MASK, 0x1));
+       regmap_update_bits(hdptx->regmap, CMN_REG(005e),
+                          OVRD_ROPLL_SDM_RSTN_MASK | ROPLL_SDM_RSTN_MASK,
+                          FIELD_PREP(OVRD_ROPLL_SDM_RSTN_MASK, 0x1) |
+                          FIELD_PREP(ROPLL_SDM_RSTN_MASK, 0x1));
+       regmap_update_bits(hdptx->regmap, CMN_REG(005e), 
ROPLL_SDC_FRAC_EN_RBR_MASK,
+                          FIELD_PREP(ROPLL_SDC_FRAC_EN_RBR_MASK, 0x1));
+       regmap_update_bits(hdptx->regmap, CMN_REG(005e), 
ROPLL_SDC_FRAC_EN_HBR_MASK,
+                          FIELD_PREP(ROPLL_SDC_FRAC_EN_HBR_MASK, 0x1));
+       regmap_update_bits(hdptx->regmap, CMN_REG(005e), 
ROPLL_SDC_FRAC_EN_HBR2_MASK,
+                          FIELD_PREP(ROPLL_SDC_FRAC_EN_HBR2_MASK, 0x1));
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(005f),
+                          OVRD_ROPLL_SDC_RSTN_MASK | ROPLL_SDC_RSTN_MASK,
+                          FIELD_PREP(OVRD_ROPLL_SDC_RSTN_MASK, 0x1) |
+                          FIELD_PREP(ROPLL_SDC_RSTN_MASK, 0x1));
+       regmap_write(hdptx->regmap, CMN_REG(0060),
+                    FIELD_PREP(ROPLL_SDM_DENOMINATOR_MASK, 0x21));
+       regmap_write(hdptx->regmap, CMN_REG(0061),
+                    FIELD_PREP(ROPLL_SDM_DENOMINATOR_MASK, 0x27));
+       regmap_write(hdptx->regmap, CMN_REG(0062),
+                    FIELD_PREP(ROPLL_SDM_DENOMINATOR_MASK, 0x27));
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(0064),
+                          ROPLL_SDM_NUM_SIGN_RBR_MASK |
+                          ROPLL_SDM_NUM_SIGN_HBR_MASK |
+                          ROPLL_SDM_NUM_SIGN_HBR2_MASK,
+                          FIELD_PREP(ROPLL_SDM_NUM_SIGN_RBR_MASK, 0x0) |
+                          FIELD_PREP(ROPLL_SDM_NUM_SIGN_HBR_MASK, 0x1) |
+                          FIELD_PREP(ROPLL_SDM_NUM_SIGN_HBR2_MASK, 0x1));
+       regmap_write(hdptx->regmap, CMN_REG(0065),
+                    FIELD_PREP(ROPLL_SDM_NUM_MASK, 0x0));
+       regmap_write(hdptx->regmap, CMN_REG(0066),
+                    FIELD_PREP(ROPLL_SDM_NUM_MASK, 0xd));
+       regmap_write(hdptx->regmap, CMN_REG(0067),
+                    FIELD_PREP(ROPLL_SDM_NUM_MASK, 0xd));
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(0069), ROPLL_SDC_N_RBR_MASK,
+                          FIELD_PREP(ROPLL_SDC_N_RBR_MASK, 0x2));
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(006a),
+                          ROPLL_SDC_N_HBR_MASK | ROPLL_SDC_N_HBR2_MASK,
+                          FIELD_PREP(ROPLL_SDC_N_HBR_MASK, 0x1) |
+                          FIELD_PREP(ROPLL_SDC_N_HBR2_MASK, 0x1));
+
+       regmap_write(hdptx->regmap, CMN_REG(006c),
+                    FIELD_PREP(ROPLL_SDC_NUM_MASK, 0x3));
+       regmap_write(hdptx->regmap, CMN_REG(006d),
+                    FIELD_PREP(ROPLL_SDC_NUM_MASK, 0x7));
+       regmap_write(hdptx->regmap, CMN_REG(006e),
+                    FIELD_PREP(ROPLL_SDC_NUM_MASK, 0x7));
+
+       regmap_write(hdptx->regmap, CMN_REG(0070),
+                    FIELD_PREP(ROPLL_SDC_DENO_MASK, 0x8));
+       regmap_write(hdptx->regmap, CMN_REG(0071),
+                    FIELD_PREP(ROPLL_SDC_DENO_MASK, 0x18));
+       regmap_write(hdptx->regmap, CMN_REG(0072),
+                    FIELD_PREP(ROPLL_SDC_DENO_MASK, 0x18));
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(0074),
+                          OVRD_ROPLL_SDC_NDIV_RSTN_MASK | 
ROPLL_SDC_NDIV_RSTN_MASK,
+                          FIELD_PREP(OVRD_ROPLL_SDC_NDIV_RSTN_MASK, 0x1) |
+                          FIELD_PREP(ROPLL_SDC_NDIV_RSTN_MASK, 0x1));
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(0077), 
ANA_ROPLL_SSC_CLK_DIV_SEL_MASK,
+                          FIELD_PREP(ANA_ROPLL_SSC_CLK_DIV_SEL_MASK, 0x1));
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(0081), 
ANA_PLL_CD_TX_SER_RATE_SEL_MASK,
+                          FIELD_PREP(ANA_PLL_CD_TX_SER_RATE_SEL_MASK, 0x0));
+       regmap_update_bits(hdptx->regmap, CMN_REG(0081),
+                          ANA_PLL_CD_HSCLK_EAST_EN_MASK | 
ANA_PLL_CD_HSCLK_WEST_EN_MASK,
+                          FIELD_PREP(ANA_PLL_CD_HSCLK_EAST_EN_MASK, 0x1) |
+                          FIELD_PREP(ANA_PLL_CD_HSCLK_WEST_EN_MASK, 0x0));
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(0082), 
ANA_PLL_CD_VREG_GAIN_CTRL_MASK,
+                          FIELD_PREP(ANA_PLL_CD_VREG_GAIN_CTRL_MASK, 0x4));
+       regmap_update_bits(hdptx->regmap, CMN_REG(0083), 
ANA_PLL_CD_VREG_ICTRL_MASK,
+                          FIELD_PREP(ANA_PLL_CD_VREG_ICTRL_MASK, 0x1));
+       regmap_update_bits(hdptx->regmap, CMN_REG(0084), PLL_LCRO_CLK_SEL_MASK,
+                          FIELD_PREP(PLL_LCRO_CLK_SEL_MASK, 0x1));
+       regmap_update_bits(hdptx->regmap, CMN_REG(0085), 
ANA_PLL_SYNC_LOSS_DET_MODE_MASK,
+                          FIELD_PREP(ANA_PLL_SYNC_LOSS_DET_MODE_MASK, 0x3));
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(0087), 
ANA_PLL_TX_HS_CLK_EN_MASK,
+                          FIELD_PREP(ANA_PLL_TX_HS_CLK_EN_MASK, 0x1));
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(0097), DIG_CLK_SEL_MASK,
+                          FIELD_PREP(DIG_CLK_SEL_MASK, 0x1));
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(0099), 
CMN_ROPLL_ALONE_MODE_MASK,
+                          FIELD_PREP(CMN_ROPLL_ALONE_MODE_MASK, 0x1));
+       regmap_update_bits(hdptx->regmap, CMN_REG(009a), HS_SPEED_SEL_MASK,
+                          FIELD_PREP(HS_SPEED_SEL_MASK, 0x1));
+       regmap_update_bits(hdptx->regmap, CMN_REG(009b), LS_SPEED_SEL_MASK,
+                          FIELD_PREP(LS_SPEED_SEL_MASK, 0x1));
+}
+
+static int rk_hdptx_dp_aux_init(struct rk_hdptx_phy *hdptx)
+{
+       u32 status;
+       int ret;
+
+       regmap_update_bits(hdptx->regmap, SB_REG(0102), 
ANA_SB_RXTERM_OFFSP_MASK,
+                          FIELD_PREP(ANA_SB_RXTERM_OFFSP_MASK, 0x3));
+       regmap_update_bits(hdptx->regmap, SB_REG(0103), 
ANA_SB_RXTERM_OFFSN_MASK,
+                          FIELD_PREP(ANA_SB_RXTERM_OFFSN_MASK, 0x3));
+       regmap_update_bits(hdptx->regmap, SB_REG(0104), SB_AUX_EN_MASK,
+                          FIELD_PREP(SB_AUX_EN_MASK, 0x1));
+       regmap_update_bits(hdptx->regmap, SB_REG(0105), 
ANA_SB_TX_HLVL_PROG_MASK,
+                          FIELD_PREP(ANA_SB_TX_HLVL_PROG_MASK, 0x7));
+       regmap_update_bits(hdptx->regmap, SB_REG(0106), 
ANA_SB_TX_LLVL_PROG_MASK,
+                          FIELD_PREP(ANA_SB_TX_LLVL_PROG_MASK, 0x7));
+
+       regmap_update_bits(hdptx->regmap, SB_REG(010d), 
ANA_SB_DMRX_LPBK_DATA_MASK,
+                          FIELD_PREP(ANA_SB_DMRX_LPBK_DATA_MASK, 0x1));
+
+       regmap_update_bits(hdptx->regmap, SB_REG(010f), 
ANA_SB_VREG_GAIN_CTRL_MASK,
+                          FIELD_PREP(ANA_SB_VREG_GAIN_CTRL_MASK, 0x0));
+       regmap_update_bits(hdptx->regmap, SB_REG(0110),
+                          ANA_SB_VREG_OUT_SEL_MASK | ANA_SB_VREG_REF_SEL_MASK,
+                          FIELD_PREP(ANA_SB_VREG_OUT_SEL_MASK, 0x1) |
+                          FIELD_PREP(ANA_SB_VREG_REF_SEL_MASK, 0x1));
+
+       regmap_update_bits(hdptx->regmap, SB_REG(0113),
+                          SB_RX_RCAL_OPT_CODE_MASK | SB_RX_RTERM_CTRL_MASK,
+                          FIELD_PREP(SB_RX_RCAL_OPT_CODE_MASK, 0x1) |
+                          FIELD_PREP(SB_RX_RTERM_CTRL_MASK, 0x3));
+       regmap_update_bits(hdptx->regmap, SB_REG(0114),
+                          SB_TG_SB_EN_DELAY_TIME_MASK | 
SB_TG_RXTERM_EN_DELAY_TIME_MASK,
+                          FIELD_PREP(SB_TG_SB_EN_DELAY_TIME_MASK, 0x2) |
+                          FIELD_PREP(SB_TG_RXTERM_EN_DELAY_TIME_MASK, 0x2));
+       regmap_update_bits(hdptx->regmap, SB_REG(0115),
+                          SB_READY_DELAY_TIME_MASK | 
SB_TG_OSC_EN_DELAY_TIME_MASK,
+                          FIELD_PREP(SB_READY_DELAY_TIME_MASK, 0x2) |
+                          FIELD_PREP(SB_TG_OSC_EN_DELAY_TIME_MASK, 0x2));
+       regmap_update_bits(hdptx->regmap, SB_REG(0116),
+                          AFC_RSTN_DELAY_TIME_MASK,
+                          FIELD_PREP(AFC_RSTN_DELAY_TIME_MASK, 0x2));
+       regmap_update_bits(hdptx->regmap, SB_REG(0117),
+                          FAST_PULSE_TIME_MASK,
+                          FIELD_PREP(FAST_PULSE_TIME_MASK, 0x4));
+       regmap_update_bits(hdptx->regmap, SB_REG(0118),
+                          SB_TG_EARC_DMRX_RECVRD_CLK_CNT_MASK,
+                          FIELD_PREP(SB_TG_EARC_DMRX_RECVRD_CLK_CNT_MASK, 
0xa));
+
+       regmap_update_bits(hdptx->regmap, SB_REG(011a), 
SB_TG_CNT_RUN_NO_7_0_MASK,
+                          FIELD_PREP(SB_TG_CNT_RUN_NO_7_0_MASK, 0x3));
+       regmap_update_bits(hdptx->regmap, SB_REG(011b),
+                          SB_EARC_SIG_DET_BYPASS_MASK | SB_AFC_TOL_MASK,
+                          FIELD_PREP(SB_EARC_SIG_DET_BYPASS_MASK, 0x1) |
+                          FIELD_PREP(SB_AFC_TOL_MASK, 0x3));
+       regmap_update_bits(hdptx->regmap, SB_REG(011c), SB_AFC_STB_NUM_MASK,
+                          FIELD_PREP(SB_AFC_STB_NUM_MASK, 0x4));
+       regmap_update_bits(hdptx->regmap, SB_REG(011d), SB_TG_OSC_CNT_MIN_MASK,
+                          FIELD_PREP(SB_TG_OSC_CNT_MIN_MASK, 0x67));
+       regmap_update_bits(hdptx->regmap, SB_REG(011e), SB_TG_OSC_CNT_MAX_MASK,
+                          FIELD_PREP(SB_TG_OSC_CNT_MAX_MASK, 0x6a));
+       regmap_update_bits(hdptx->regmap, SB_REG(011f), SB_PWM_AFC_CTRL_MASK,
+                          FIELD_PREP(SB_PWM_AFC_CTRL_MASK, 0x5));
+       regmap_update_bits(hdptx->regmap, SB_REG(011f), SB_RCAL_RSTN_MASK,
+                          FIELD_PREP(SB_RCAL_RSTN_MASK, 0x1));
+       regmap_update_bits(hdptx->regmap, SB_REG(0120), SB_AUX_EN_IN_MASK,
+                          FIELD_PREP(SB_AUX_EN_IN_MASK, 0x1));
+
+       regmap_update_bits(hdptx->regmap, SB_REG(0102), OVRD_SB_RXTERM_EN_MASK,
+                          FIELD_PREP(OVRD_SB_RXTERM_EN_MASK, 0x1));
+       regmap_update_bits(hdptx->regmap, SB_REG(0103), 
OVRD_SB_RX_RESCAL_DONE_MASK,
+                          FIELD_PREP(OVRD_SB_RX_RESCAL_DONE_MASK, 0x1));
+       regmap_update_bits(hdptx->regmap, SB_REG(0104), OVRD_SB_EN_MASK,
+                          FIELD_PREP(OVRD_SB_EN_MASK, 0x1));
+       regmap_update_bits(hdptx->regmap, SB_REG(0104), OVRD_SB_AUX_EN_MASK,
+                          FIELD_PREP(OVRD_SB_AUX_EN_MASK, 0x1));
+
+       regmap_update_bits(hdptx->regmap, SB_REG(010f), OVRD_SB_VREG_EN_MASK,
+                          FIELD_PREP(OVRD_SB_VREG_EN_MASK, 0x1));
+
+       regmap_write(hdptx->grf, GRF_HDPTX_CON0,
+                    HDPTX_I_BGR_EN << 16 | FIELD_PREP(HDPTX_I_BGR_EN, 0x1));
+       regmap_write(hdptx->grf, GRF_HDPTX_CON0,
+                    HDPTX_I_BIAS_EN << 16 | FIELD_PREP(HDPTX_I_BIAS_EN, 0x1));
+       usleep_range(20, 25);
+
+       reset_control_deassert(hdptx->rsts[RST_INIT].rstc);
+       usleep_range(20, 25);
+       reset_control_deassert(hdptx->rsts[RST_CMN].rstc);
+       usleep_range(20, 25);
+
+       regmap_update_bits(hdptx->regmap, SB_REG(0103), 
OVRD_SB_RX_RESCAL_DONE_MASK,
+                          FIELD_PREP(OVRD_SB_RX_RESCAL_DONE_MASK, 0x1));
+       usleep_range(100, 110);
+       regmap_update_bits(hdptx->regmap, SB_REG(0104), SB_EN_MASK,
+                          FIELD_PREP(SB_EN_MASK, 0x1));
+       usleep_range(100, 110);
+       regmap_update_bits(hdptx->regmap, SB_REG(0102), SB_RXTERM_EN_MASK,
+                          FIELD_PREP(SB_RXTERM_EN_MASK, 0x1));
+       usleep_range(20, 25);
+       regmap_update_bits(hdptx->regmap, SB_REG(010f), SB_VREG_EN_MASK,
+                          FIELD_PREP(SB_VREG_EN_MASK, 0x1));
+       usleep_range(20, 25);
+       regmap_update_bits(hdptx->regmap, SB_REG(0104), SB_AUX_EN_MASK,
+                          FIELD_PREP(SB_AUX_EN_MASK, 0x1));
+       usleep_range(100, 110);
+
+       ret = regmap_read_poll_timeout(hdptx->grf, GRF_HDPTX_STATUS,
+                                      status, FIELD_GET(HDPTX_O_SB_RDY, 
status),
+                                      50, 1000);
+       if (ret) {
+               dev_err(hdptx->dev, "Failed to get phy sb ready: %d\n", ret);
+               return ret;
+       }
+
+       return 0;
+}
+
 static int rk_hdptx_phy_power_on(struct phy *phy)
 {
        struct rk_hdptx_phy *hdptx = phy_get_drvdata(phy);
        int bus_width = phy_get_bus_width(hdptx->phy);
-       int ret;
+       enum phy_mode mode = phy_get_mode(phy);
+       int ret, lane;
 
        /*
         * FIXME: Temporary workaround to pass pixel_clk_rate
@@ -919,9 +1450,37 @@ static int rk_hdptx_phy_power_on(struct phy *phy)
        if (ret)
                return ret;
 
-       ret = rk_hdptx_ropll_tmds_mode_config(hdptx, rate);
-       if (ret)
-               rk_hdptx_phy_consumer_put(hdptx, true);
+       if (mode == PHY_MODE_DP) {
+               regmap_write(hdptx->grf, GRF_HDPTX_CON0,
+                            HDPTX_MODE_SEL << 16 | FIELD_PREP(HDPTX_MODE_SEL, 
0x1));
+
+               for (lane = 0; lane < 4; lane++) {
+                       regmap_update_bits(hdptx->regmap, LANE_REG(031e) + 
0x400 * lane,
+                                          LN_POLARITY_INV_MASK | 
LN_LANE_MODE_MASK,
+                                          FIELD_PREP(LN_POLARITY_INV_MASK, 0) |
+                                          FIELD_PREP(LN_LANE_MODE_MASK, 1));
+               }
+
+               regmap_update_bits(hdptx->regmap, LNTOP_REG(0200), 
PROTOCOL_SEL_MASK,
+                                  FIELD_PREP(PROTOCOL_SEL_MASK, 0x0));
+               regmap_update_bits(hdptx->regmap, LNTOP_REG(0206), 
DATA_BUS_WIDTH_MASK,
+                                  FIELD_PREP(DATA_BUS_WIDTH_MASK, 0x1));
+               regmap_update_bits(hdptx->regmap, LNTOP_REG(0206), 
DATA_BUS_WIDTH_SEL_MASK,
+                                  FIELD_PREP(DATA_BUS_WIDTH_SEL_MASK, 0x0));
+
+               rk_hdptx_dp_pll_init(hdptx);
+
+               ret = rk_hdptx_dp_aux_init(hdptx);
+               if (ret)
+                       rk_hdptx_phy_consumer_put(hdptx, true);
+       } else {
+               regmap_write(hdptx->grf, GRF_HDPTX_CON0,
+                            HDPTX_MODE_SEL << 16 | FIELD_PREP(HDPTX_MODE_SEL, 
0x0));
+
+               ret = rk_hdptx_ropll_tmds_mode_config(hdptx, rate);
+               if (ret)
+                       rk_hdptx_phy_consumer_put(hdptx, true);
+       }
 
        return ret;
 }
@@ -933,9 +1492,308 @@ static int rk_hdptx_phy_power_off(struct phy *phy)
        return rk_hdptx_phy_consumer_put(hdptx, false);
 }
 
+static int rk_hdptx_phy_verify_config(struct rk_hdptx_phy *hdptx,
+                                     struct phy_configure_opts_dp *dp)
+{
+       int i;
+
+       if (dp->set_rate) {
+               switch (dp->link_rate) {
+               case 1620:
+               case 2700:
+               case 5400:
+                       break;
+               default:
+                       return -EINVAL;
+               }
+       }
+
+       if (dp->set_lanes) {
+               switch (dp->lanes) {
+               case 1:
+               case 2:
+               case 4:
+                       break;
+               default:
+                       return -EINVAL;
+               }
+       }
+
+       if (dp->set_voltages) {
+               for (i = 0; i < hdptx->lanes; i++) {
+                       if (dp->voltage[i] > 3 || dp->pre[i] > 3)
+                               return -EINVAL;
+
+                       if (dp->voltage[i] + dp->pre[i] > 3)
+                               return -EINVAL;
+               }
+       }
+
+       return 0;
+}
+
+static int rk_hdptx_phy_set_rate(struct rk_hdptx_phy *hdptx,
+                                struct phy_configure_opts_dp *dp)
+{
+       u32 bw, status;
+       int ret;
+
+       regmap_write(hdptx->grf, GRF_HDPTX_CON0,
+                    HDPTX_I_PLL_EN << 16 | FIELD_PREP(HDPTX_I_PLL_EN, 0x0));
+
+       switch (dp->link_rate) {
+       case 1620:
+               bw = DP_BW_RBR;
+               break;
+       case 2700:
+               bw = DP_BW_HBR;
+               break;
+       case 5400:
+               bw = DP_BW_HBR2;
+               break;
+       default:
+               return -EINVAL;
+       }
+       hdptx->link_rate = dp->link_rate;
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(0008), OVRD_LCPLL_EN_MASK | 
LCPLL_EN_MASK,
+                          FIELD_PREP(OVRD_LCPLL_EN_MASK, 0x1) |
+                          FIELD_PREP(LCPLL_EN_MASK, 0x0));
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(003d), OVRD_ROPLL_EN_MASK | 
ROPLL_EN_MASK,
+                          FIELD_PREP(OVRD_ROPLL_EN_MASK, 0x1) |
+                          FIELD_PREP(ROPLL_EN_MASK, 0x1));
+
+       if (dp->ssc) {
+               regmap_update_bits(hdptx->regmap, CMN_REG(0074),
+                                  OVRD_ROPLL_SSC_EN_MASK | ROPLL_SSC_EN_MASK,
+                                  FIELD_PREP(OVRD_ROPLL_SSC_EN_MASK, 0x1) |
+                                  FIELD_PREP(ROPLL_SSC_EN_MASK, 0x1));
+               regmap_write(hdptx->regmap, CMN_REG(0075),
+                            FIELD_PREP(ANA_ROPLL_SSC_FM_DEVIATION_MASK, 0xc));
+               regmap_update_bits(hdptx->regmap, CMN_REG(0076),
+                                  ANA_ROPLL_SSC_FM_FREQ_MASK,
+                                  FIELD_PREP(ANA_ROPLL_SSC_FM_FREQ_MASK, 
0x1f));
+
+               regmap_update_bits(hdptx->regmap, CMN_REG(0099), SSC_EN_MASK,
+                                  FIELD_PREP(SSC_EN_MASK, 0x2));
+       } else {
+               regmap_update_bits(hdptx->regmap, CMN_REG(0074),
+                                  OVRD_ROPLL_SSC_EN_MASK | ROPLL_SSC_EN_MASK,
+                                  FIELD_PREP(OVRD_ROPLL_SSC_EN_MASK, 0x1) |
+                                  FIELD_PREP(ROPLL_SSC_EN_MASK, 0x0));
+               regmap_write(hdptx->regmap, CMN_REG(0075),
+                            FIELD_PREP(ANA_ROPLL_SSC_FM_DEVIATION_MASK, 0x20));
+               regmap_update_bits(hdptx->regmap, CMN_REG(0076),
+                                  ANA_ROPLL_SSC_FM_FREQ_MASK,
+                                  FIELD_PREP(ANA_ROPLL_SSC_FM_FREQ_MASK, 0xc));
+
+               regmap_update_bits(hdptx->regmap, CMN_REG(0099), SSC_EN_MASK,
+                                  FIELD_PREP(SSC_EN_MASK, 0x0));
+       }
+
+       regmap_update_bits(hdptx->regmap, CMN_REG(0095), DP_TX_LINK_BW_MASK,
+                          FIELD_PREP(DP_TX_LINK_BW_MASK, bw));
+
+       regmap_write(hdptx->grf, GRF_HDPTX_CON0,
+                    HDPTX_I_PLL_EN << 16 | FIELD_PREP(HDPTX_I_PLL_EN, 0x1));
+
+       ret = regmap_read_poll_timeout(hdptx->grf, GRF_HDPTX_STATUS,
+                                      status, FIELD_GET(HDPTX_O_PLL_LOCK_DONE, 
status),
+                                      50, 1000);
+       if (ret) {
+               dev_err(hdptx->dev, "Failed to get phy pll lock: %d\n", ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int rk_hdptx_phy_set_lanes(struct rk_hdptx_phy *hdptx,
+                                 struct phy_configure_opts_dp *dp)
+{
+       hdptx->lanes = dp->lanes;
+
+       regmap_update_bits(hdptx->regmap, LNTOP_REG(0207), LANE_EN_MASK,
+                          FIELD_PREP(LANE_EN_MASK, GENMASK(hdptx->lanes - 1, 
0)));
+
+       return 0;
+}
+
+static void rk_hdptx_phy_set_voltage(struct rk_hdptx_phy *hdptx,
+                                    struct phy_configure_opts_dp *dp,
+                                    u8 lane)
+{
+       const struct tx_drv_ctrl *ctrl;
+       u32 offset = lane * 0x400;
+
+       switch (hdptx->link_rate) {
+       case 1620:
+               ctrl = &tx_drv_ctrl_rbr[dp->voltage[lane]][dp->pre[lane]];
+               regmap_update_bits(hdptx->regmap, LANE_REG(030a) + offset,
+                                  LN_TX_JEQ_EVEN_CTRL_RBR_MASK,
+                                  FIELD_PREP(LN_TX_JEQ_EVEN_CTRL_RBR_MASK,
+                                  ctrl->tx_jeq_even_ctrl));
+               regmap_update_bits(hdptx->regmap, LANE_REG(030c) + offset,
+                                  LN_TX_JEQ_ODD_CTRL_RBR_MASK,
+                                  FIELD_PREP(LN_TX_JEQ_ODD_CTRL_RBR_MASK,
+                                  ctrl->tx_jeq_odd_ctrl));
+               regmap_update_bits(hdptx->regmap, LANE_REG(0311) + offset,
+                                  LN_TX_SER_40BIT_EN_RBR_MASK,
+                                  FIELD_PREP(LN_TX_SER_40BIT_EN_RBR_MASK, 
0x1));
+               break;
+       case 2700:
+               ctrl = &tx_drv_ctrl_hbr[dp->voltage[lane]][dp->pre[lane]];
+               regmap_update_bits(hdptx->regmap, LANE_REG(030b) + offset,
+                                  LN_TX_JEQ_EVEN_CTRL_HBR_MASK,
+                                  FIELD_PREP(LN_TX_JEQ_EVEN_CTRL_HBR_MASK,
+                                  ctrl->tx_jeq_even_ctrl));
+               regmap_update_bits(hdptx->regmap, LANE_REG(030d) + offset,
+                                  LN_TX_JEQ_ODD_CTRL_HBR_MASK,
+                                  FIELD_PREP(LN_TX_JEQ_ODD_CTRL_HBR_MASK,
+                                  ctrl->tx_jeq_odd_ctrl));
+               regmap_update_bits(hdptx->regmap, LANE_REG(0311) + offset,
+                                  LN_TX_SER_40BIT_EN_HBR_MASK,
+                                  FIELD_PREP(LN_TX_SER_40BIT_EN_HBR_MASK, 
0x1));
+               break;
+       case 5400:
+       default:
+               ctrl = &tx_drv_ctrl_hbr2[dp->voltage[lane]][dp->pre[lane]];
+               regmap_update_bits(hdptx->regmap, LANE_REG(030b) + offset,
+                                  LN_TX_JEQ_EVEN_CTRL_HBR2_MASK,
+                                  FIELD_PREP(LN_TX_JEQ_EVEN_CTRL_HBR2_MASK,
+                                  ctrl->tx_jeq_even_ctrl));
+               regmap_update_bits(hdptx->regmap, LANE_REG(030d) + offset,
+                                  LN_TX_JEQ_ODD_CTRL_HBR2_MASK,
+                                  FIELD_PREP(LN_TX_JEQ_ODD_CTRL_HBR2_MASK,
+                                  ctrl->tx_jeq_odd_ctrl));
+               regmap_update_bits(hdptx->regmap, LANE_REG(0311) + offset,
+                                  LN_TX_SER_40BIT_EN_HBR2_MASK,
+                                  FIELD_PREP(LN_TX_SER_40BIT_EN_HBR2_MASK, 
0x1));
+               break;
+       }
+
+       regmap_update_bits(hdptx->regmap, LANE_REG(0303) + offset,
+                          OVRD_LN_TX_DRV_LVL_CTRL_MASK | 
LN_TX_DRV_LVL_CTRL_MASK,
+                          FIELD_PREP(OVRD_LN_TX_DRV_LVL_CTRL_MASK, 0x1) |
+                          FIELD_PREP(LN_TX_DRV_LVL_CTRL_MASK,
+                                     ctrl->tx_drv_lvl_ctrl));
+       regmap_update_bits(hdptx->regmap, LANE_REG(0304) + offset,
+                          OVRD_LN_TX_DRV_POST_LVL_CTRL_MASK |
+                          LN_TX_DRV_POST_LVL_CTRL_MASK,
+                          FIELD_PREP(OVRD_LN_TX_DRV_POST_LVL_CTRL_MASK, 0x1) |
+                          FIELD_PREP(LN_TX_DRV_POST_LVL_CTRL_MASK,
+                                     ctrl->tx_drv_post_lvl_ctrl));
+       regmap_update_bits(hdptx->regmap, LANE_REG(0305) + offset,
+                          OVRD_LN_TX_DRV_PRE_LVL_CTRL_MASK |
+                          LN_TX_DRV_PRE_LVL_CTRL_MASK,
+                          FIELD_PREP(OVRD_LN_TX_DRV_PRE_LVL_CTRL_MASK, 0x1) |
+                          FIELD_PREP(LN_TX_DRV_PRE_LVL_CTRL_MASK,
+                                     ctrl->tx_drv_pre_lvl_ctrl));
+       regmap_update_bits(hdptx->regmap, LANE_REG(0306) + offset,
+                          LN_ANA_TX_DRV_IDRV_IDN_CTRL_MASK |
+                          LN_ANA_TX_DRV_IDRV_IUP_CTRL_MASK |
+                          LN_ANA_TX_DRV_ACCDRV_EN_MASK,
+                          FIELD_PREP(LN_ANA_TX_DRV_IDRV_IDN_CTRL_MASK,
+                                     ctrl->ana_tx_drv_idrv_idn_ctrl) |
+                          FIELD_PREP(LN_ANA_TX_DRV_IDRV_IUP_CTRL_MASK,
+                                     ctrl->ana_tx_drv_idrv_iup_ctrl) |
+                          FIELD_PREP(LN_ANA_TX_DRV_ACCDRV_EN_MASK,
+                                     ctrl->ana_tx_drv_accdrv_en));
+       regmap_update_bits(hdptx->regmap, LANE_REG(0307) + offset,
+                          LN_ANA_TX_DRV_ACCDRV_POL_SEL_MASK |
+                          LN_ANA_TX_DRV_ACCDRV_CTRL_MASK,
+                          FIELD_PREP(LN_ANA_TX_DRV_ACCDRV_POL_SEL_MASK, 0x1) |
+                          FIELD_PREP(LN_ANA_TX_DRV_ACCDRV_CTRL_MASK,
+                                     ctrl->ana_tx_drv_accdrv_ctrl));
+
+       regmap_update_bits(hdptx->regmap, LANE_REG(030a) + offset,
+                          LN_ANA_TX_JEQ_EN_MASK,
+                          FIELD_PREP(LN_ANA_TX_JEQ_EN_MASK, 
ctrl->ana_tx_jeq_en));
+
+       regmap_update_bits(hdptx->regmap, LANE_REG(0310) + offset,
+                          LN_ANA_TX_SYNC_LOSS_DET_MODE_MASK,
+                          FIELD_PREP(LN_ANA_TX_SYNC_LOSS_DET_MODE_MASK, 0x3));
+
+       regmap_update_bits(hdptx->regmap, LANE_REG(0316) + offset,
+                          LN_ANA_TX_SER_VREG_GAIN_CTRL_MASK,
+                          FIELD_PREP(LN_ANA_TX_SER_VREG_GAIN_CTRL_MASK, 0x2));
+
+       regmap_update_bits(hdptx->regmap, LANE_REG(031b) + offset,
+                          LN_ANA_TX_RESERVED_MASK,
+                          FIELD_PREP(LN_ANA_TX_RESERVED_MASK, 0x1));
+}
+
+static int rk_hdptx_phy_set_voltages(struct rk_hdptx_phy *hdptx,
+                                    struct phy_configure_opts_dp *dp)
+{
+       u8 lane;
+       u32 status;
+       int ret;
+
+       for (lane = 0; lane < hdptx->lanes; lane++)
+               rk_hdptx_phy_set_voltage(hdptx, dp, lane);
+
+       reset_control_deassert(hdptx->rsts[RST_LANE].rstc);
+
+       ret = regmap_read_poll_timeout(hdptx->grf, GRF_HDPTX_STATUS,
+                                      status, FIELD_GET(HDPTX_O_PHY_RDY, 
status),
+                                      50, 5000);
+       if (ret) {
+               dev_err(hdptx->dev, "Failed to get phy ready: %d\n", ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int rk_hdptx_phy_configure(struct phy *phy, union phy_configure_opts 
*opts)
+{
+       struct rk_hdptx_phy *hdptx = phy_get_drvdata(phy);
+       enum phy_mode mode = phy_get_mode(phy);
+       int ret;
+
+       if (mode != PHY_MODE_DP)
+               return 0;
+
+       ret = rk_hdptx_phy_verify_config(hdptx, &opts->dp);
+       if (ret) {
+               dev_err(hdptx->dev, "invalid params for phy configure\n");
+               return ret;
+       }
+
+       if (opts->dp.set_rate) {
+               ret = rk_hdptx_phy_set_rate(hdptx, &opts->dp);
+               if (ret) {
+                       dev_err(hdptx->dev, "failed to set rate: %d\n", ret);
+                       return ret;
+               }
+       }
+
+       if (opts->dp.set_lanes) {
+               ret = rk_hdptx_phy_set_lanes(hdptx, &opts->dp);
+               if (ret) {
+                       dev_err(hdptx->dev, "failed to set lanes: %d\n", ret);
+                       return ret;
+               }
+       }
+
+       if (opts->dp.set_voltages) {
+               ret = rk_hdptx_phy_set_voltages(hdptx, &opts->dp);
+               if (ret) {
+                       dev_err(hdptx->dev, "failed to set voltages: %d\n",
+                               ret);
+                       return ret;
+               }
+       }
+
+       return 0;
+}
+
 static const struct phy_ops rk_hdptx_phy_ops = {
        .power_on  = rk_hdptx_phy_power_on,
        .power_off = rk_hdptx_phy_power_off,
+       .configure = rk_hdptx_phy_configure,
        .owner     = THIS_MODULE,
 };
 
@@ -1150,5 +2008,6 @@ module_platform_driver(rk_hdptx_phy_driver);
 
 MODULE_AUTHOR("Algea Cao <algea....@rock-chips.com>");
 MODULE_AUTHOR("Cristian Ciocaltea <cristian.ciocal...@collabora.com>");
+MODULE_AUTHOR("Damon Ding <damon.d...@rock-chips.com>");
 MODULE_DESCRIPTION("Samsung HDMI/eDP Transmitter Combo PHY Driver");
 MODULE_LICENSE("GPL");
-- 
2.34.1


Reply via email to