浏览代码

disp: msm: dp: fixed version check 4nm target

Changes include support to correct the version
check for DP PHY changes for 4nm target.

Change-Id: Ib891d43bd5db10edc4b49a70f7a3b8af073167cd
Signed-off-by: Soutrik Mukhopadhyay <[email protected]>
Soutrik Mukhopadhyay 3 年之前
父节点
当前提交
aa0eacb522
共有 2 个文件被更改,包括 8 次插入11 次删除
  1. 1 1
      msm/dp/dp_catalog.c
  2. 7 10
      msm/dp/dp_catalog_v420.c

+ 1 - 1
msm/dp/dp_catalog.c

@@ -461,7 +461,7 @@ static bool dp_catalog_ctrl_wait_for_phy_ready(
 	u32 const pll_timeout_us = 10000;
 
 	phy_version = dp_catalog_get_dp_phy_version(&catalog->dp_catalog);
-	if (phy_version >= 60000000) {
+	if (phy_version >= 0x60000000) {
 		reg = DP_PHY_STATUS_V600;
 	} else {
 		reg = DP_PHY_STATUS;

+ 7 - 10
msm/dp/dp_catalog_v420.c

@@ -98,21 +98,18 @@ static void dp_catalog_aux_setup_v420(struct dp_catalog_aux *aux,
 	}
 
 	catalog = dp_catalog_get_priv_v420(aux);
-	phy_version = dp_catalog_get_dp_phy_version(catalog->dpc);
-	if (phy_version >= 60000000) {
-		io_data = catalog->io->dp_phy;
-		dp_write(DP_PHY_PD_CTL, 0x79);
-		wmb(); /* make sure PD programming happened */
 
+	io_data = catalog->io->dp_phy;
+	dp_write(DP_PHY_PD_CTL, 0x67);
+	wmb(); /* make sure PD programming happened */
+
+	phy_version = dp_catalog_get_dp_phy_version(catalog->dpc);
+	if (phy_version >= 0x60000000) {
 		/* Turn on BIAS current for PHY/PLL */
 		io_data = catalog->io->dp_pll;
 		dp_write(QSERDES_COM_BIAS_EN_CLKBUFLR_EN_V600, 0x1D);
 		wmb(); /* make sure BIAS programming happened */
 	} else {
-		io_data = catalog->io->dp_phy;
-		dp_write(DP_PHY_PD_CTL, 0x67);
-		wmb(); /* make sure PD programming happened */
-
 		/* Turn on BIAS current for PHY/PLL */
 		io_data = catalog->io->dp_pll;
 		dp_write(QSERDES_COM_BIAS_EN_CLKBUFLR_EN, 0x17);
@@ -146,7 +143,7 @@ static void dp_catalog_aux_clear_hw_int_v420(struct dp_catalog_aux *aux)
 	catalog = dp_catalog_get_priv_v420(aux);
 	phy_version = dp_catalog_get_dp_phy_version(catalog->dpc);
 	io_data = catalog->io->dp_phy;
-	if (phy_version >= 60000000)
+	if (phy_version >= 0x60000000)
 		data = dp_read(DP_PHY_AUX_INTERRUPT_STATUS_V600);
 	else
 		data = dp_read(DP_PHY_AUX_INTERRUPT_STATUS_V420);