Commit 488f116d authored by Johan Hovold's avatar Johan Hovold Committed by Vinod Koul
Browse files

phy: qcom-qmp-combo: add DP configuration tables 



In preparation for merging the USB and DP configurations, add dedicated
pointers for the DP serdes and tx tables to the configurations.

Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20221114110621.4639-17-johan+linaro@kernel.org


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

drivers/phy/qualcomm/phy-qcom-qmp-combo.c

+24 −21
Original line number Diff line number Diff line
@@ -816,6 +816,11 @@ struct qmp_phy_cfg { 
	const struct qmp_phy_init_tbl *pcs_usb_tbl;

	int pcs_usb_tbl_num;



	const struct qmp_phy_init_tbl *dp_serdes_tbl;

	int dp_serdes_tbl_num;

	const struct qmp_phy_init_tbl *dp_tx_tbl;

	int dp_tx_tbl_num;



	/* Init sequence for DP PHY block link rates */

	const struct qmp_phy_init_tbl *serdes_tbl_rbr;

	int serdes_tbl_rbr_num;
@@ -1030,10 +1035,10 @@ static const struct qmp_phy_cfg sc7180_dpphy_cfg = { 
	.type			= PHY_TYPE_DP,

	.lanes			= 2,



	.serdes_tbl		= qmp_v3_dp_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(qmp_v3_dp_serdes_tbl),

	.tx_tbl			= qmp_v3_dp_tx_tbl,

	.tx_tbl_num		= ARRAY_SIZE(qmp_v3_dp_tx_tbl),

	.dp_serdes_tbl		= qmp_v3_dp_serdes_tbl,

	.dp_serdes_tbl_num	= ARRAY_SIZE(qmp_v3_dp_serdes_tbl),

	.dp_tx_tbl		= qmp_v3_dp_tx_tbl,

	.dp_tx_tbl_num		= ARRAY_SIZE(qmp_v3_dp_tx_tbl),



	.serdes_tbl_rbr		= qmp_v3_dp_serdes_tbl_rbr,

	.serdes_tbl_rbr_num	= ARRAY_SIZE(qmp_v3_dp_serdes_tbl_rbr),
@@ -1147,10 +1152,10 @@ static const struct qmp_phy_cfg sc8180x_dpphy_cfg = { 
	.type			= PHY_TYPE_DP,

	.lanes			= 2,



	.serdes_tbl		= qmp_v4_dp_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(qmp_v4_dp_serdes_tbl),

	.tx_tbl			= qmp_v4_dp_tx_tbl,

	.tx_tbl_num		= ARRAY_SIZE(qmp_v4_dp_tx_tbl),

	.dp_serdes_tbl		= qmp_v4_dp_serdes_tbl,

	.dp_serdes_tbl_num	= ARRAY_SIZE(qmp_v4_dp_serdes_tbl),

	.dp_tx_tbl		= qmp_v4_dp_tx_tbl,

	.dp_tx_tbl_num		= ARRAY_SIZE(qmp_v4_dp_tx_tbl),



	.serdes_tbl_rbr		= qmp_v4_dp_serdes_tbl_rbr,

	.serdes_tbl_rbr_num	= ARRAY_SIZE(qmp_v4_dp_serdes_tbl_rbr),
@@ -1203,10 +1208,10 @@ static const struct qmp_phy_cfg sc8280xp_usb43dp_dp_cfg = { 
	.type			= PHY_TYPE_DP,

	.lanes			= 2,



	.serdes_tbl		= qmp_v5_dp_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(qmp_v5_dp_serdes_tbl),

	.tx_tbl			= qmp_v5_5nm_dp_tx_tbl,

	.tx_tbl_num		= ARRAY_SIZE(qmp_v5_5nm_dp_tx_tbl),

	.dp_serdes_tbl		= qmp_v5_dp_serdes_tbl,

	.dp_serdes_tbl_num	= ARRAY_SIZE(qmp_v5_dp_serdes_tbl),

	.dp_tx_tbl		= qmp_v5_5nm_dp_tx_tbl,

	.dp_tx_tbl_num		= ARRAY_SIZE(qmp_v5_5nm_dp_tx_tbl),



	.serdes_tbl_rbr		= qmp_v4_dp_serdes_tbl_rbr,

	.serdes_tbl_rbr_num	= ARRAY_SIZE(qmp_v4_dp_serdes_tbl_rbr),
@@ -1263,10 +1268,10 @@ static const struct qmp_phy_cfg sm8250_dpphy_cfg = { 
	.type			= PHY_TYPE_DP,

	.lanes			= 2,



	.serdes_tbl		= qmp_v4_dp_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(qmp_v4_dp_serdes_tbl),

	.tx_tbl			= qmp_v4_dp_tx_tbl,

	.tx_tbl_num		= ARRAY_SIZE(qmp_v4_dp_tx_tbl),

	.dp_serdes_tbl		= qmp_v4_dp_serdes_tbl,

	.dp_serdes_tbl_num	= ARRAY_SIZE(qmp_v4_dp_serdes_tbl),

	.dp_tx_tbl		= qmp_v4_dp_tx_tbl,

	.dp_tx_tbl_num		= ARRAY_SIZE(qmp_v4_dp_tx_tbl),



	.serdes_tbl_rbr		= qmp_v4_dp_serdes_tbl_rbr,

	.serdes_tbl_rbr_num	= ARRAY_SIZE(qmp_v4_dp_serdes_tbl_rbr),
@@ -1324,10 +1329,8 @@ static int qmp_combo_dp_serdes_init(struct qmp_phy *qphy) 
	const struct qmp_phy_cfg *cfg = qphy->cfg;

	void __iomem *serdes = qphy->dp_serdes;

	const struct phy_configure_opts_dp *dp_opts = &qphy->dp_opts;

	const struct qmp_phy_init_tbl *serdes_tbl = cfg->serdes_tbl;

	int serdes_tbl_num = cfg->serdes_tbl_num;



	qmp_combo_configure(serdes, serdes_tbl, serdes_tbl_num);

	qmp_combo_configure(serdes, cfg->dp_serdes_tbl, cfg->dp_serdes_tbl_num);



	switch (dp_opts->link_rate) {

	case 1620:
@@ -2000,10 +2003,10 @@ static int qmp_combo_dp_power_on(struct phy *phy) 


	qmp_combo_dp_serdes_init(qphy);



	qmp_combo_configure_lane(tx, cfg->tx_tbl, cfg->tx_tbl_num, 1);

	qmp_combo_configure_lane(tx, cfg->dp_tx_tbl, cfg->dp_tx_tbl_num, 1);



	if (cfg->lanes >= 2)

		qmp_combo_configure_lane(qphy->dp_tx2, cfg->tx_tbl, cfg->tx_tbl_num, 2);

		qmp_combo_configure_lane(qphy->dp_tx2, cfg->dp_tx_tbl, cfg->dp_tx_tbl_num, 2);



	/* Configure special DP tx tunings */

	cfg->configure_dp_tx(qphy);