Commit 91346358 authored by Soutrik Mukhopadhyay's avatar Soutrik Mukhopadhyay Committed by Vinod Koul
Browse files

phy: qcom: edp: Introduce aux_cfg array for version specific aux settings 



In order to support different HW versions, introduce aux_cfg array
to move v4 specific aux configuration settings.

Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarSoutrik Mukhopadhyay <quic_mukhopad@quicinc.com>
Link: https://lore.kernel.org/r/20241004103046.22209-3-quic_mukhopad@quicinc.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 7adb3d22

drivers/phy/qualcomm/phy-qcom-edp.c

+17 −24
Original line number Diff line number Diff line
@@ -32,16 +32,8 @@ 
#define DP_PHY_PD_CTL                           0x001c

#define DP_PHY_MODE                             0x0020



#define DP_PHY_AUX_CFG0				0x0024

#define DP_PHY_AUX_CFG1				0x0028

#define DP_PHY_AUX_CFG2				0x002C

#define DP_PHY_AUX_CFG3				0x0030

#define DP_PHY_AUX_CFG4				0x0034

#define DP_PHY_AUX_CFG5				0x0038

#define DP_PHY_AUX_CFG6				0x003C

#define DP_PHY_AUX_CFG7				0x0040

#define DP_PHY_AUX_CFG8				0x0044

#define DP_PHY_AUX_CFG9				0x0048

#define DP_AUX_CFG_SIZE                         10

#define DP_PHY_AUX_CFG(n)                       (0x24 + (0x04 * (n)))



#define DP_PHY_AUX_INTERRUPT_MASK		0x0058
@@ -90,6 +82,7 @@ struct phy_ver_ops { 


struct qcom_edp_phy_cfg {

	bool is_edp;

	const u8 *aux_cfg;

	const struct qcom_edp_swing_pre_emph_cfg *swing_pre_emph_cfg;

	const struct phy_ver_ops *ver_ops;

};
@@ -186,11 +179,15 @@ static const struct qcom_edp_swing_pre_emph_cfg edp_phy_swing_pre_emph_cfg = { 
	.pre_emphasis_hbr3_hbr2 = &edp_pre_emp_hbr2_hbr3,

};



static const u8 edp_phy_aux_cfg_v4[10] = {

	0x00, 0x13, 0x24, 0x00, 0x0a, 0x26, 0x0a, 0x03, 0x37, 0x03

};



static int qcom_edp_phy_init(struct phy *phy)

{

	struct qcom_edp *edp = phy_get_drvdata(phy);

	u8 aux_cfg[DP_AUX_CFG_SIZE];

	int ret;

	u8 cfg8;



	ret = regulator_bulk_enable(ARRAY_SIZE(edp->supplies), edp->supplies);

	if (ret)
@@ -200,6 +197,8 @@ static int qcom_edp_phy_init(struct phy *phy) 
	if (ret)

		goto out_disable_supplies;



	memcpy(aux_cfg, edp->cfg->aux_cfg, sizeof(aux_cfg));



	writel(DP_PHY_PD_CTL_PWRDN | DP_PHY_PD_CTL_AUX_PWRDN |

	       DP_PHY_PD_CTL_PLL_PWRDN | DP_PHY_PD_CTL_DP_CLAMP_EN,

	       edp->edp + DP_PHY_PD_CTL);
@@ -222,22 +221,12 @@ static int qcom_edp_phy_init(struct phy *phy) 
	 * even needed.

	 */

	if (edp->cfg->swing_pre_emph_cfg && !edp->is_edp)

		cfg8 = 0xb7;

	else

		cfg8 = 0x37;

		aux_cfg[8] = 0xb7;



	writel(0xfc, edp->edp + DP_PHY_MODE);



	writel(0x00, edp->edp + DP_PHY_AUX_CFG0);

	writel(0x13, edp->edp + DP_PHY_AUX_CFG1);

	writel(0x24, edp->edp + DP_PHY_AUX_CFG2);

	writel(0x00, edp->edp + DP_PHY_AUX_CFG3);

	writel(0x0a, edp->edp + DP_PHY_AUX_CFG4);

	writel(0x26, edp->edp + DP_PHY_AUX_CFG5);

	writel(0x0a, edp->edp + DP_PHY_AUX_CFG6);

	writel(0x03, edp->edp + DP_PHY_AUX_CFG7);

	writel(cfg8, edp->edp + DP_PHY_AUX_CFG8);

	writel(0x03, edp->edp + DP_PHY_AUX_CFG9);

	for (int i = 0; i < DP_AUX_CFG_SIZE; i++)

		writel(aux_cfg[i], edp->edp + DP_PHY_AUX_CFG(i));



	writel(PHY_AUX_STOP_ERR_MASK | PHY_AUX_DEC_ERR_MASK |

	       PHY_AUX_SYNC_ERR_MASK | PHY_AUX_ALIGN_ERR_MASK |
@@ -519,16 +508,19 @@ static const struct phy_ver_ops qcom_edp_phy_ops_v4 = { 
};



static const struct qcom_edp_phy_cfg sc7280_dp_phy_cfg = {

	.aux_cfg = edp_phy_aux_cfg_v4,

	.ver_ops = &qcom_edp_phy_ops_v4,

};



static const struct qcom_edp_phy_cfg sc8280xp_dp_phy_cfg = {

	.aux_cfg = edp_phy_aux_cfg_v4,

	.swing_pre_emph_cfg = &dp_phy_swing_pre_emph_cfg,

	.ver_ops = &qcom_edp_phy_ops_v4,

};



static const struct qcom_edp_phy_cfg sc8280xp_edp_phy_cfg = {

	.is_edp = true,

	.aux_cfg = edp_phy_aux_cfg_v4,

	.swing_pre_emph_cfg = &edp_phy_swing_pre_emph_cfg,

	.ver_ops = &qcom_edp_phy_ops_v4,

};
@@ -707,6 +699,7 @@ 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,

	.swing_pre_emph_cfg = &dp_phy_swing_pre_emph_cfg,

	.ver_ops = &qcom_edp_phy_ops_v6,

};