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

phy: qcom-qmp-ufs: drop multi-PHY support 



Each UFS QMP PHY device provides just a single UFS PHY. Drop support
for handling multiple child PHYs.

Acked-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Tested-by: Bjorn Andersson <bjorn.andersson@linaro.org> # UFS, PCIe and USB on SC8180X
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20220607213203.2819885-26-dmitry.baryshkov@linaro.org


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

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

+3 −30
Original line number Diff line number Diff line
@@ -669,8 +669,6 @@ struct qmp_phy { 
 * @vregs: regulator supplies bulk data

 *

 * @phys: array of per-lane phy descriptors

 * @phy_mutex: mutex lock for PHY common block initialization

 * @init_count: phy common block initialization count

 * @ufs_reset: optional UFS PHY reset handle

 */

struct qcom_qmp {
@@ -681,9 +679,6 @@ struct qcom_qmp { 


	struct qmp_phy **phys;



	struct mutex phy_mutex;

	int init_count;



	struct reset_control *ufs_reset;

};
@@ -931,17 +926,11 @@ static int qcom_qmp_phy_ufs_com_init(struct qmp_phy *qphy) 
	void __iomem *pcs = qphy->pcs;

	int ret;



	mutex_lock(&qmp->phy_mutex);

	if (qmp->init_count++) {

		mutex_unlock(&qmp->phy_mutex);

		return 0;

	}



	/* turn on regulator supplies */

	ret = regulator_bulk_enable(cfg->num_vregs, qmp->vregs);

	if (ret) {

		dev_err(qmp->dev, "failed to enable regulators, err=%d\n", ret);

		goto err_unlock;

		return ret;

	}



	ret = clk_bulk_prepare_enable(cfg->num_clks, qmp->clks);
@@ -956,14 +945,10 @@ static int qcom_qmp_phy_ufs_com_init(struct qmp_phy *qphy) 
		qphy_setbits(pcs, QPHY_POWER_DOWN_CONTROL,

			     cfg->pwrdn_ctrl);



	mutex_unlock(&qmp->phy_mutex);



	return 0;



err_disable_regulators:

	regulator_bulk_disable(cfg->num_vregs, qmp->vregs);

err_unlock:

	mutex_unlock(&qmp->phy_mutex);



	return ret;

}
@@ -973,20 +958,12 @@ static int qcom_qmp_phy_ufs_com_exit(struct qmp_phy *qphy) 
	struct qcom_qmp *qmp = qphy->qmp;

	const struct qmp_phy_cfg *cfg = qphy->cfg;



	mutex_lock(&qmp->phy_mutex);

	if (--qmp->init_count) {

		mutex_unlock(&qmp->phy_mutex);

		return 0;

	}



	reset_control_assert(qmp->ufs_reset);



	clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks);



	regulator_bulk_disable(cfg->num_vregs, qmp->vregs);



	mutex_unlock(&qmp->phy_mutex);



	return 0;

}
@@ -1322,7 +1299,7 @@ static int qcom_qmp_phy_ufs_probe(struct platform_device *pdev) 
	struct phy_provider *phy_provider;

	void __iomem *serdes;

	const struct qmp_phy_cfg *cfg = NULL;

	int num, id, expected_phys;

	int num, id;

	int ret;



	qmp = devm_kzalloc(dev, sizeof(*qmp), GFP_KERNEL);
@@ -1342,10 +1319,6 @@ static int qcom_qmp_phy_ufs_probe(struct platform_device *pdev) 
	if (IS_ERR(serdes))

		return PTR_ERR(serdes);



	expected_phys = cfg->nlanes;



	mutex_init(&qmp->phy_mutex);



	ret = qcom_qmp_phy_ufs_clk_init(dev, cfg);

	if (ret)

		return ret;
@@ -1360,7 +1333,7 @@ static int qcom_qmp_phy_ufs_probe(struct platform_device *pdev) 


	num = of_get_available_child_count(dev->of_node);

	/* do we have a rogue child node ? */

	if (num > expected_phys)

	if (num > 1)

		return -EINVAL;



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