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

phy: qcom-qmp-usb: consolidate lane config 



For legacy reasons, there are two configuration parameters that appear
to describe the number of lanes a PHY has, even if "nlanes" was actually
used for a different purpose.

Replace them both with a new field simply named "lanes".

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


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

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

+20 −32
Original line number Diff line number Diff line
@@ -1429,8 +1429,7 @@ static const struct qmp_phy_init_tbl sc8280xp_usb3_uniphy_pcs_tbl[] = { 


/* struct qmp_phy_cfg - per-PHY initialization config */

struct qmp_phy_cfg {

	/* number of lanes provided by phy */

	int nlanes;

	int lanes;



	/* Init sequence for PHY blocks - serdes, tx, rx, pcs */

	const struct qmp_phy_init_tbl *serdes_tbl;
@@ -1470,8 +1469,6 @@ struct qmp_phy_cfg { 


	/* true, if PHY has a separate DP_COM control block */

	bool has_phy_dp_com_ctrl;

	/* true, if PHY has secondary tx/rx lanes to be configured */

	bool is_dual_lane_phy;



	/* Offset from PCS to PCS_USB region */

	unsigned int pcs_usb_offset;
@@ -1603,7 +1600,7 @@ static const char * const qmp_phy_vreg_l[] = { 
};



static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = {

	.nlanes			= 1,

	.lanes			= 1,



	.serdes_tbl		= ipq8074_usb3_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(ipq8074_usb3_serdes_tbl),
@@ -1627,7 +1624,7 @@ static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = { 
};



static const struct qmp_phy_cfg msm8996_usb3phy_cfg = {

	.nlanes			= 1,

	.lanes			= 1,



	.serdes_tbl		= msm8996_usb3_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(msm8996_usb3_serdes_tbl),
@@ -1651,7 +1648,7 @@ static const struct qmp_phy_cfg msm8996_usb3phy_cfg = { 
};



static const struct qmp_phy_cfg qmp_v3_usb3phy_cfg = {

	.nlanes			= 1,

	.lanes			= 2,



	.serdes_tbl		= qmp_v3_usb3_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(qmp_v3_usb3_serdes_tbl),
@@ -1678,11 +1675,10 @@ static const struct qmp_phy_cfg qmp_v3_usb3phy_cfg = { 
	.pwrdn_delay_max	= POWER_DOWN_DELAY_US_MAX,



	.has_phy_dp_com_ctrl	= true,

	.is_dual_lane_phy	= true,

};



static const struct qmp_phy_cfg sc7180_usb3phy_cfg = {

	.nlanes			= 1,

	.lanes			= 2,



	.serdes_tbl		= qmp_v3_usb3_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(qmp_v3_usb3_serdes_tbl),
@@ -1709,11 +1705,10 @@ static const struct qmp_phy_cfg sc7180_usb3phy_cfg = { 
	.pwrdn_delay_max	= POWER_DOWN_DELAY_US_MAX,



	.has_phy_dp_com_ctrl	= true,

	.is_dual_lane_phy	= true,

};



static const struct qmp_phy_cfg sc8280xp_usb3_uniphy_cfg = {

	.nlanes			= 1,

	.lanes			= 1,



	.serdes_tbl		= sc8280xp_usb3_uniphy_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_serdes_tbl),
@@ -1741,7 +1736,7 @@ static const struct qmp_phy_cfg sc8280xp_usb3_uniphy_cfg = { 
};



static const struct qmp_phy_cfg qmp_v3_usb3_uniphy_cfg = {

	.nlanes			= 1,

	.lanes			= 1,



	.serdes_tbl		= qmp_v3_usb3_uniphy_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(qmp_v3_usb3_uniphy_serdes_tbl),
@@ -1769,7 +1764,7 @@ static const struct qmp_phy_cfg qmp_v3_usb3_uniphy_cfg = { 
};



static const struct qmp_phy_cfg msm8998_usb3phy_cfg = {

	.nlanes                 = 1,

	.lanes			= 2,



	.serdes_tbl             = msm8998_usb3_serdes_tbl,

	.serdes_tbl_num         = ARRAY_SIZE(msm8998_usb3_serdes_tbl),
@@ -1790,12 +1785,10 @@ static const struct qmp_phy_cfg msm8998_usb3phy_cfg = { 
	.start_ctrl             = SERDES_START | PCS_START,

	.pwrdn_ctrl             = SW_PWRDN,

	.phy_status		= PHYSTATUS,



	.is_dual_lane_phy       = true,

};



static const struct qmp_phy_cfg sm8150_usb3phy_cfg = {

	.nlanes			= 1,

	.lanes			= 2,



	.serdes_tbl		= sm8150_usb3_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(sm8150_usb3_serdes_tbl),
@@ -1826,11 +1819,10 @@ static const struct qmp_phy_cfg sm8150_usb3phy_cfg = { 
	.pwrdn_delay_max	= POWER_DOWN_DELAY_US_MAX,



	.has_phy_dp_com_ctrl	= true,

	.is_dual_lane_phy	= true,

};



static const struct qmp_phy_cfg sm8150_usb3_uniphy_cfg = {

	.nlanes			= 1,

	.lanes			= 1,



	.serdes_tbl		= sm8150_usb3_uniphy_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(sm8150_usb3_uniphy_serdes_tbl),
@@ -1861,7 +1853,7 @@ static const struct qmp_phy_cfg sm8150_usb3_uniphy_cfg = { 
};



static const struct qmp_phy_cfg sm8250_usb3phy_cfg = {

	.nlanes			= 1,

	.lanes			= 2,



	.serdes_tbl		= sm8150_usb3_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(sm8150_usb3_serdes_tbl),
@@ -1891,11 +1883,10 @@ static const struct qmp_phy_cfg sm8250_usb3phy_cfg = { 
	.pwrdn_delay_max	= POWER_DOWN_DELAY_US_MAX,



	.has_phy_dp_com_ctrl	= true,

	.is_dual_lane_phy	= true,

};



static const struct qmp_phy_cfg sm8250_usb3_uniphy_cfg = {

	.nlanes			= 1,

	.lanes			= 1,



	.serdes_tbl		= sm8150_usb3_uniphy_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(sm8150_usb3_uniphy_serdes_tbl),
@@ -1926,7 +1917,7 @@ static const struct qmp_phy_cfg sm8250_usb3_uniphy_cfg = { 
};



static const struct qmp_phy_cfg sdx55_usb3_uniphy_cfg = {

	.nlanes			= 1,

	.lanes			= 1,



	.serdes_tbl		= sm8150_usb3_uniphy_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(sm8150_usb3_uniphy_serdes_tbl),
@@ -1957,7 +1948,7 @@ static const struct qmp_phy_cfg sdx55_usb3_uniphy_cfg = { 
};



static const struct qmp_phy_cfg sdx65_usb3_uniphy_cfg = {

	.nlanes			= 1,

	.lanes			= 1,



	.serdes_tbl		= sm8150_usb3_uniphy_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(sm8150_usb3_uniphy_serdes_tbl),
@@ -1988,7 +1979,7 @@ static const struct qmp_phy_cfg sdx65_usb3_uniphy_cfg = { 
};



static const struct qmp_phy_cfg sm8350_usb3phy_cfg = {

	.nlanes			= 1,

	.lanes			= 2,



	.serdes_tbl		= sm8150_usb3_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(sm8150_usb3_serdes_tbl),
@@ -2018,11 +2009,10 @@ static const struct qmp_phy_cfg sm8350_usb3phy_cfg = { 
	.pwrdn_delay_max	= POWER_DOWN_DELAY_US_MAX,



	.has_phy_dp_com_ctrl	= true,

	.is_dual_lane_phy	= true,

};



static const struct qmp_phy_cfg sm8350_usb3_uniphy_cfg = {

	.nlanes			= 1,

	.lanes			= 1,



	.serdes_tbl		= sm8150_usb3_uniphy_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(sm8150_usb3_uniphy_serdes_tbl),
@@ -2053,7 +2043,7 @@ static const struct qmp_phy_cfg sm8350_usb3_uniphy_cfg = { 
};



static const struct qmp_phy_cfg qcm2290_usb3phy_cfg = {

	.nlanes			= 1,

	.lanes			= 2,



	.serdes_tbl		= qcm2290_usb3_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(qcm2290_usb3_serdes_tbl),
@@ -2074,8 +2064,6 @@ static const struct qmp_phy_cfg qcm2290_usb3phy_cfg = { 
	.start_ctrl		= SERDES_START | PCS_START,

	.pwrdn_ctrl		= SW_PWRDN,

	.phy_status		= PHYSTATUS,



	.is_dual_lane_phy	= true,

};



static void qmp_usb_configure_lane(void __iomem *base,
@@ -2232,14 +2220,14 @@ static int qmp_usb_power_on(struct phy *phy) 
	/* Tx, Rx, and PCS configurations */

	qmp_usb_configure_lane(tx, cfg->regs, cfg->tx_tbl, cfg->tx_tbl_num, 1);



	if (cfg->is_dual_lane_phy) {

	if (cfg->lanes >= 2) {

		qmp_usb_configure_lane(qphy->tx2, cfg->regs,

					cfg->tx_tbl, cfg->tx_tbl_num, 2);

	}



	qmp_usb_configure_lane(rx, cfg->regs, cfg->rx_tbl, cfg->rx_tbl_num, 1);



	if (cfg->is_dual_lane_phy) {

	if (cfg->lanes >= 2) {

		qmp_usb_configure_lane(qphy->rx2, cfg->regs,

					cfg->rx_tbl, cfg->rx_tbl_num, 2);

	}
@@ -2613,7 +2601,7 @@ int qmp_usb_create(struct device *dev, struct device_node *np, int id, 
	if (cfg->pcs_usb_offset)

		qphy->pcs_usb = qphy->pcs + cfg->pcs_usb_offset;



	if (cfg->is_dual_lane_phy) {

	if (cfg->lanes >= 2) {

		qphy->tx2 = devm_of_iomap(dev, np, 3, NULL);

		if (IS_ERR(qphy->tx2))

			return PTR_ERR(qphy->tx2);