Commit 3b193748 authored by Xiangxu Yin's avatar Xiangxu Yin Committed by Vinod Koul
Browse files

phy: qcom: qmp-usbc: Add regulator init_load support 



QMP USBC PHY drivers previously did not set init_load_uA for regulators,
which could result in incorrect vote levels. This patch introduces
regulator definitions with proper init_load_uA values based on each
chip's power grid design.

QCS615 USB3 PHY was previously reusing qcm2290_usb3phy_cfg, but its
regulator requirements differ. A new qcs615_usb3phy_cfg is added to
reflect the correct settings.

Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: default avatarXiangxu Yin <xiangxu.yin@oss.qualcomm.com>
Link: https://patch.msgid.link/20251215-add-displayport-support-for-qcs615-platform-v8-4-cbc72c88a44e@oss.qualcomm.com


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

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

+39 −29
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ struct qmp_phy_cfg { 
	int (*calibrate_dp_phy)(struct qmp_usbc *qmp);



	/* regulators to be requested */

	const char * const *vreg_list;

	const struct regulator_bulk_data *vreg_list;

	int num_vregs;



	/* array of registers with different offsets */
@@ -428,9 +428,19 @@ static const char * const usb3phy_reset_l[] = { 
	"phy_phy", "phy",

};



/* list of regulators */

static const char * const qmp_phy_vreg_l[] = {

	"vdda-phy", "vdda-pll",

static const struct regulator_bulk_data qmp_phy_msm8998_vreg_l[] = {

	{ .supply = "vdda-phy", .init_load_uA = 68600 },

	{ .supply = "vdda-pll", .init_load_uA = 14200 },

};



static const struct regulator_bulk_data qmp_phy_sm2290_vreg_l[] = {

	{ .supply = "vdda-phy", .init_load_uA = 66100 },

	{ .supply = "vdda-pll", .init_load_uA = 13300 },

};



static const struct regulator_bulk_data qmp_phy_qcs615_vreg_l[] = {

	{ .supply = "vdda-phy", .init_load_uA = 50000 },

	{ .supply = "vdda-pll", .init_load_uA = 20000 },

};



static const struct qmp_usbc_offsets qmp_usbc_offsets_v3_qcm2290 = {
@@ -454,8 +464,8 @@ static const struct qmp_phy_cfg msm8998_usb3phy_cfg = { 
	.rx_tbl_num             = ARRAY_SIZE(msm8998_usb3_rx_tbl),

	.pcs_tbl                = msm8998_usb3_pcs_tbl,

	.pcs_tbl_num            = ARRAY_SIZE(msm8998_usb3_pcs_tbl),

	.vreg_list              = qmp_phy_vreg_l,

	.num_vregs              = ARRAY_SIZE(qmp_phy_vreg_l),

	.vreg_list              = qmp_phy_msm8998_vreg_l,

	.num_vregs              = ARRAY_SIZE(qmp_phy_msm8998_vreg_l),

	.regs                   = qmp_v3_usb3phy_regs_layout,

};
@@ -470,8 +480,8 @@ static const struct qmp_phy_cfg qcm2290_usb3phy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(qcm2290_usb3_rx_tbl),

	.pcs_tbl		= qcm2290_usb3_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(qcm2290_usb3_pcs_tbl),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.vreg_list		= qmp_phy_sm2290_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_sm2290_vreg_l),

	.regs			= qmp_v3_usb3phy_regs_layout_qcm2290,

};
@@ -486,8 +496,24 @@ static const struct qmp_phy_cfg sdm660_usb3phy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(sdm660_usb3_rx_tbl),

	.pcs_tbl		= qcm2290_usb3_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(qcm2290_usb3_pcs_tbl),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.vreg_list		= qmp_phy_msm8998_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_msm8998_vreg_l),

	.regs			= qmp_v3_usb3phy_regs_layout_qcm2290,

};



static const struct qmp_phy_cfg qcs615_usb3phy_cfg = {

	.offsets		= &qmp_usbc_offsets_v3_qcm2290,



	.serdes_tbl		= qcm2290_usb3_serdes_tbl,

	.serdes_tbl_num		= ARRAY_SIZE(qcm2290_usb3_serdes_tbl),

	.tx_tbl			= qcm2290_usb3_tx_tbl,

	.tx_tbl_num		= ARRAY_SIZE(qcm2290_usb3_tx_tbl),

	.rx_tbl			= qcm2290_usb3_rx_tbl,

	.rx_tbl_num		= ARRAY_SIZE(qcm2290_usb3_rx_tbl),

	.pcs_tbl		= qcm2290_usb3_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(qcm2290_usb3_pcs_tbl),

	.vreg_list		= qmp_phy_qcs615_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_qcs615_vreg_l),

	.regs			= qmp_v3_usb3phy_regs_layout_qcm2290,

};
@@ -773,23 +799,6 @@ static const struct dev_pm_ops qmp_usbc_pm_ops = { 
			   qmp_usbc_runtime_resume, NULL)

};



static int qmp_usbc_vreg_init(struct qmp_usbc *qmp)

{

	const struct qmp_phy_cfg *cfg = qmp->cfg;

	struct device *dev = qmp->dev;

	int num = cfg->num_vregs;

	int i;



	qmp->vregs = devm_kcalloc(dev, num, sizeof(*qmp->vregs), GFP_KERNEL);

	if (!qmp->vregs)

		return -ENOMEM;



	for (i = 0; i < num; i++)

		qmp->vregs[i].supply = cfg->vreg_list[i];



	return devm_regulator_bulk_get(dev, num, qmp->vregs);

}



static int qmp_usbc_reset_init(struct qmp_usbc *qmp,

			      const char *const *reset_list,

			      int num_resets)
@@ -1097,7 +1106,8 @@ static int qmp_usbc_probe(struct platform_device *pdev) 


	mutex_init(&qmp->phy_mutex);



	ret = qmp_usbc_vreg_init(qmp);

	ret = devm_regulator_bulk_get_const(qmp->dev, qmp->cfg->num_vregs,

					    qmp->cfg->vreg_list, &qmp->vregs);

	if (ret)

		return ret;
@@ -1163,7 +1173,7 @@ static const struct of_device_id qmp_usbc_of_match_table[] = { 
		.data = &qcm2290_usb3phy_cfg,

	}, {

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

		.data = &qcm2290_usb3phy_cfg,

		.data = &qcs615_usb3phy_cfg,

	}, {

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

		.data = &sdm660_usb3phy_cfg,