Commit fcf63482 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Vinod Koul
Browse files

phy: qcom-qmp-usb: rework reset handling 



All legacy bindings of USB PHYs use "phy", "common" resets, while newer
style bindings use "phy", "phy_phy" resets. In preparation for
converting existing legacy PHY bindings to use newer scheme, drop reset
lists from configuration struture and reference reset lists directly.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230824211952.1397699-4-dmitry.baryshkov@linaro.org


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

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

+26 −45
Original line number Diff line number Diff line
@@ -1172,9 +1172,6 @@ struct qmp_phy_cfg { 
	const struct qmp_phy_init_tbl *pcs_usb_tbl;

	int pcs_usb_tbl_num;



	/* resets to be requested */

	const char * const *reset_list;

	int num_resets;

	/* regulators to be requested */

	const char * const *vreg_list;

	int num_vregs;
@@ -1206,6 +1203,7 @@ struct qmp_usb { 
	struct clk *pipe_clk;

	struct clk_bulk_data *clks;

	int num_clks;

	int num_resets;

	struct reset_control_bulk_data *resets;

	struct regulator_bulk_data *vregs;
@@ -1246,11 +1244,11 @@ static const char * const qmp_usb_phy_clk_l[] = { 
};



/* list of resets */

static const char * const msm8996_usb3phy_reset_l[] = {

static const char * const usb3phy_legacy_reset_l[] = {

	"phy", "common",

};



static const char * const qcm2290_usb3phy_reset_l[] = {

static const char * const usb3phy_reset_l[] = {

	"phy_phy", "phy",

};
@@ -1296,8 +1294,6 @@ static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(ipq8074_usb3_rx_tbl),

	.pcs_tbl		= ipq8074_usb3_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(ipq8074_usb3_pcs_tbl),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v3_usb3phy_regs_layout,
@@ -1316,8 +1312,6 @@ static const struct qmp_phy_cfg ipq9574_usb3phy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(ipq9574_usb3_rx_tbl),

	.pcs_tbl		= ipq9574_usb3_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(ipq9574_usb3_pcs_tbl),

	.reset_list		= qcm2290_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v3_usb3phy_regs_layout,
@@ -1334,8 +1328,6 @@ static const struct qmp_phy_cfg msm8996_usb3phy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(msm8996_usb3_rx_tbl),

	.pcs_tbl		= msm8996_usb3_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(msm8996_usb3_pcs_tbl),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v2_usb3phy_regs_layout,
@@ -1354,8 +1346,6 @@ static const struct qmp_phy_cfg sa8775p_usb3_uniphy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_rx_tbl),

	.pcs_tbl		= sa8775p_usb3_uniphy_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(sa8775p_usb3_uniphy_pcs_tbl),

	.reset_list		= qcm2290_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v5_usb3phy_regs_layout,
@@ -1374,8 +1364,6 @@ static const struct qmp_phy_cfg sc8280xp_usb3_uniphy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_rx_tbl),

	.pcs_tbl		= sc8280xp_usb3_uniphy_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(sc8280xp_usb3_uniphy_pcs_tbl),

	.reset_list		= qcm2290_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v5_usb3phy_regs_layout,
@@ -1392,8 +1380,6 @@ static const struct qmp_phy_cfg qmp_v3_usb3_uniphy_cfg = { 
	.rx_tbl_num		= ARRAY_SIZE(qmp_v3_usb3_uniphy_rx_tbl),

	.pcs_tbl		= qmp_v3_usb3_uniphy_pcs_tbl,

	.pcs_tbl_num		= ARRAY_SIZE(qmp_v3_usb3_uniphy_pcs_tbl),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v3_usb3phy_regs_layout,
@@ -1412,8 +1398,6 @@ 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),

	.reset_list             = msm8996_usb3phy_reset_l,

	.num_resets             = ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list              = qmp_phy_vreg_l,

	.num_vregs              = ARRAY_SIZE(qmp_phy_vreg_l),

	.regs                   = qmp_v3_usb3phy_regs_layout,
@@ -1432,8 +1416,6 @@ static const struct qmp_phy_cfg sm8150_usb3_uniphy_cfg = { 
	.pcs_tbl_num		= ARRAY_SIZE(sm8150_usb3_uniphy_pcs_tbl),

	.pcs_usb_tbl		= sm8150_usb3_uniphy_pcs_usb_tbl,

	.pcs_usb_tbl_num	= ARRAY_SIZE(sm8150_usb3_uniphy_pcs_usb_tbl),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v4_usb3phy_regs_layout,
@@ -1455,8 +1437,6 @@ static const struct qmp_phy_cfg sm8250_usb3_uniphy_cfg = { 
	.pcs_tbl_num		= ARRAY_SIZE(sm8250_usb3_uniphy_pcs_tbl),

	.pcs_usb_tbl		= sm8250_usb3_uniphy_pcs_usb_tbl,

	.pcs_usb_tbl_num	= ARRAY_SIZE(sm8250_usb3_uniphy_pcs_usb_tbl),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v4_usb3phy_regs_layout,
@@ -1478,8 +1458,6 @@ static const struct qmp_phy_cfg sdx55_usb3_uniphy_cfg = { 
	.pcs_tbl_num		= ARRAY_SIZE(sm8250_usb3_uniphy_pcs_tbl),

	.pcs_usb_tbl		= sm8250_usb3_uniphy_pcs_usb_tbl,

	.pcs_usb_tbl_num	= ARRAY_SIZE(sm8250_usb3_uniphy_pcs_usb_tbl),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v4_usb3phy_regs_layout,
@@ -1501,8 +1479,6 @@ static const struct qmp_phy_cfg sdx65_usb3_uniphy_cfg = { 
	.pcs_tbl_num		= ARRAY_SIZE(sm8350_usb3_uniphy_pcs_tbl),

	.pcs_usb_tbl		= sm8350_usb3_uniphy_pcs_usb_tbl,

	.pcs_usb_tbl_num	= ARRAY_SIZE(sm8350_usb3_uniphy_pcs_usb_tbl),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v5_usb3phy_regs_layout,
@@ -1524,8 +1500,6 @@ static const struct qmp_phy_cfg sm8350_usb3_uniphy_cfg = { 
	.pcs_tbl_num		= ARRAY_SIZE(sm8350_usb3_uniphy_pcs_tbl),

	.pcs_usb_tbl		= sm8350_usb3_uniphy_pcs_usb_tbl,

	.pcs_usb_tbl_num	= ARRAY_SIZE(sm8350_usb3_uniphy_pcs_usb_tbl),

	.reset_list		= msm8996_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v5_usb3phy_regs_layout,
@@ -1547,8 +1521,6 @@ 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),

	.reset_list		= qcm2290_usb3phy_reset_l,

	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v3_usb3phy_regs_layout,
@@ -1605,13 +1577,13 @@ static int qmp_usb_init(struct phy *phy) 
		return ret;

	}



	ret = reset_control_bulk_assert(cfg->num_resets, qmp->resets);

	ret = reset_control_bulk_assert(qmp->num_resets, qmp->resets);

	if (ret) {

		dev_err(qmp->dev, "reset assert failed\n");

		goto err_disable_regulators;

	}



	ret = reset_control_bulk_deassert(cfg->num_resets, qmp->resets);

	ret = reset_control_bulk_deassert(qmp->num_resets, qmp->resets);

	if (ret) {

		dev_err(qmp->dev, "reset deassert failed\n");

		goto err_disable_regulators;
@@ -1626,7 +1598,7 @@ static int qmp_usb_init(struct phy *phy) 
	return 0;



err_assert_reset:

	reset_control_bulk_assert(cfg->num_resets, qmp->resets);

	reset_control_bulk_assert(qmp->num_resets, qmp->resets);

err_disable_regulators:

	regulator_bulk_disable(cfg->num_vregs, qmp->vregs);
@@ -1638,7 +1610,7 @@ static int qmp_usb_exit(struct phy *phy) 
	struct qmp_usb *qmp = phy_get_drvdata(phy);

	const struct qmp_phy_cfg *cfg = qmp->cfg;



	reset_control_bulk_assert(cfg->num_resets, qmp->resets);

	reset_control_bulk_assert(qmp->num_resets, qmp->resets);



	clk_bulk_disable_unprepare(qmp->num_clks, qmp->clks);
@@ -1880,22 +1852,25 @@ static int qmp_usb_vreg_init(struct qmp_usb *qmp) 
	return devm_regulator_bulk_get(dev, num, qmp->vregs);

}



static int qmp_usb_reset_init(struct qmp_usb *qmp)

static int qmp_usb_reset_init(struct qmp_usb *qmp,

			      const char *const *reset_list,

			      int num_resets)

{

	const struct qmp_phy_cfg *cfg = qmp->cfg;

	struct device *dev = qmp->dev;

	int i;

	int ret;



	qmp->resets = devm_kcalloc(dev, cfg->num_resets,

	qmp->resets = devm_kcalloc(dev, num_resets,

				   sizeof(*qmp->resets), GFP_KERNEL);

	if (!qmp->resets)

		return -ENOMEM;



	for (i = 0; i < cfg->num_resets; i++)

		qmp->resets[i].id = cfg->reset_list[i];

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

		qmp->resets[i].id = reset_list[i];



	qmp->num_resets = num_resets;



	ret = devm_reset_control_bulk_get_exclusive(dev, cfg->num_resets, qmp->resets);

	ret = devm_reset_control_bulk_get_exclusive(dev, num_resets, qmp->resets);

	if (ret)

		return dev_err_probe(dev, ret, "failed to get resets\n");
@@ -2064,6 +2039,11 @@ static int qmp_usb_parse_dt_legacy(struct qmp_usb *qmp, struct device_node *np) 


	qmp->num_clks = ret;



	ret = qmp_usb_reset_init(qmp, usb3phy_legacy_reset_l,

				 ARRAY_SIZE(usb3phy_legacy_reset_l));

	if (ret)

		return ret;



	return 0;

}
@@ -2105,6 +2085,11 @@ static int qmp_usb_parse_dt(struct qmp_usb *qmp) 
				     "failed to get pipe clock\n");

	}



	ret = qmp_usb_reset_init(qmp, usb3phy_reset_l,

				 ARRAY_SIZE(usb3phy_reset_l));

	if (ret)

		return ret;



	return 0;

}
@@ -2126,10 +2111,6 @@ static int qmp_usb_probe(struct platform_device *pdev) 
	if (!qmp->cfg)

		return -EINVAL;



	ret = qmp_usb_reset_init(qmp);

	if (ret)

		return ret;



	ret = qmp_usb_vreg_init(qmp);

	if (ret)

		return ret;