Commit 1633802c authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Vinod Koul
Browse files

phy: qcom: qmp: Add SC8180x USB/DP combo 



The two USB QMPs are USB/DP compbo PHYs, add the compatible for this
combination to allow DP output.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210721225630.3035861-2-bjorn.andersson@linaro.org


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

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

+47 −0
Original line number Diff line number Diff line
@@ -3536,6 +3536,46 @@ static const struct qmp_phy_cfg sc8180x_pciephy_cfg = { 
	.pwrdn_delay_max	= 1005,		/* us */

};



static const struct qmp_phy_cfg sc8180x_dpphy_cfg = {

	.type			= PHY_TYPE_DP,

	.nlanes			= 1,



	.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),



	.serdes_tbl_rbr		= qmp_v4_dp_serdes_tbl_rbr,

	.serdes_tbl_rbr_num	= ARRAY_SIZE(qmp_v4_dp_serdes_tbl_rbr),

	.serdes_tbl_hbr		= qmp_v4_dp_serdes_tbl_hbr,

	.serdes_tbl_hbr_num	= ARRAY_SIZE(qmp_v4_dp_serdes_tbl_hbr),

	.serdes_tbl_hbr2	= qmp_v4_dp_serdes_tbl_hbr2,

	.serdes_tbl_hbr2_num	= ARRAY_SIZE(qmp_v4_dp_serdes_tbl_hbr2),

	.serdes_tbl_hbr3	= qmp_v4_dp_serdes_tbl_hbr3,

	.serdes_tbl_hbr3_num	= ARRAY_SIZE(qmp_v4_dp_serdes_tbl_hbr3),



	.clk_list		= qmp_v3_phy_clk_l,

	.num_clks		= ARRAY_SIZE(qmp_v3_phy_clk_l),

	.reset_list		= sc7180_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(sc7180_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v3_usb3phy_regs_layout,



	.has_phy_dp_com_ctrl	= true,

	.is_dual_lane_phy	= true,



	.dp_aux_init = qcom_qmp_v4_phy_dp_aux_init,

	.configure_dp_tx = qcom_qmp_v4_phy_configure_dp_tx,

	.configure_dp_phy = qcom_qmp_v4_phy_configure_dp_phy,

	.calibrate_dp_phy = qcom_qmp_v4_dp_phy_calibrate,

};



static const struct qmp_phy_combo_cfg sc8180x_usb3dpphy_cfg = {

	.usb_cfg		= &sm8150_usb3phy_cfg,

	.dp_cfg			= &sc8180x_dpphy_cfg,

};



static const struct qmp_phy_cfg sm8150_usb3_uniphy_cfg = {

	.type			= PHY_TYPE_USB3,

	.nlanes			= 1,
@@ -5377,6 +5417,9 @@ static const struct of_device_id qcom_qmp_phy_of_match_table[] = { 
	}, {

		.compatible = "qcom,sc8180x-qmp-usb3-phy",

		.data = &sm8150_usb3phy_cfg,

	}, {

		.compatible = "qcom,sc8180x-qmp-usb3-dp-phy",

		/* It's a combo phy */

	}, {

		.compatible = "qcom,sdm845-qhp-pcie-phy",

		.data = &sdm845_qhp_pciephy_cfg,
@@ -5454,6 +5497,10 @@ static const struct of_device_id qcom_qmp_combo_phy_of_match_table[] = { 
		.compatible = "qcom,sm8250-qmp-usb3-dp-phy",

		.data = &sm8250_usb3dpphy_cfg,

	},

	{

		.compatible = "qcom,sc8180x-qmp-usb3-dp-phy",

		.data = &sc8180x_usb3dpphy_cfg,

	},

	{ }

};