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

phy: qcom-qmp-pcie-msm8996: use bulk reset_control API 



Switch qcom-qmp-pcie-msm8996 driver to use reset_control_bulk_assert /
_deassert functions rather than hardcoding the loops in the driver
itself.

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-30-dmitry.baryshkov@linaro.org


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

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

+18 −31
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ struct qcom_qmp { 
	struct device *dev;



	struct clk_bulk_data *clks;

	struct reset_control **resets;

	struct reset_control_bulk_data *resets;

	struct regulator_bulk_data *vregs;



	struct qmp_phy **phys;
@@ -489,7 +489,7 @@ static int qcom_qmp_phy_pcie_msm8996_com_init(struct qmp_phy *qphy) 
	struct qcom_qmp *qmp = qphy->qmp;

	const struct qmp_phy_cfg *cfg = qphy->cfg;

	void __iomem *serdes = qphy->serdes;

	int ret, i;

	int ret;



	mutex_lock(&qmp->phy_mutex);

	if (qmp->init_count++) {
@@ -504,22 +504,16 @@ static int qcom_qmp_phy_pcie_msm8996_com_init(struct qmp_phy *qphy) 
		goto err_unlock;

	}



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

		ret = reset_control_assert(qmp->resets[i]);

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

	if (ret) {

			dev_err(qmp->dev, "%s reset assert failed\n",

				cfg->reset_list[i]);

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

		goto err_disable_regulators;

	}

	}



	for (i = cfg->num_resets - 1; i >= 0; i--) {

		ret = reset_control_deassert(qmp->resets[i]);

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

	if (ret) {

			dev_err(qmp->dev, "%s reset deassert failed\n",

				qphy->cfg->reset_list[i]);

			goto err_assert_reset;

		}

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

		goto err_disable_regulators;

	}



	ret = clk_bulk_prepare_enable(cfg->num_clks, qmp->clks);
@@ -534,8 +528,7 @@ static int qcom_qmp_phy_pcie_msm8996_com_init(struct qmp_phy *qphy) 
	return 0;



err_assert_reset:

	while (++i < cfg->num_resets)

		reset_control_assert(qmp->resets[i]);

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

err_disable_regulators:

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

err_unlock:
@@ -549,7 +542,6 @@ static int qcom_qmp_phy_pcie_msm8996_com_exit(struct qmp_phy *qphy) 
	struct qcom_qmp *qmp = qphy->qmp;

	const struct qmp_phy_cfg *cfg = qphy->cfg;

	void __iomem *serdes = qphy->serdes;

	int i = cfg->num_resets;



	mutex_lock(&qmp->phy_mutex);

	if (--qmp->init_count) {
@@ -564,8 +556,7 @@ static int qcom_qmp_phy_pcie_msm8996_com_exit(struct qmp_phy *qphy) 
	qphy_setbits(serdes, cfg->regs[QPHY_COM_POWER_DOWN_CONTROL],

		     SW_PWRDN);



	while (--i >= 0)

		reset_control_assert(qmp->resets[i]);

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



	clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks);
@@ -769,23 +760,19 @@ static int qcom_qmp_phy_pcie_msm8996_reset_init(struct device *dev, const struct 
{

	struct qcom_qmp *qmp = dev_get_drvdata(dev);

	int i;

	int ret;



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

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

	if (!qmp->resets)

		return -ENOMEM;



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

		struct reset_control *rst;

		const char *name = cfg->reset_list[i];

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

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



		rst = devm_reset_control_get_exclusive(dev, name);

		if (IS_ERR(rst)) {

			dev_err(dev, "failed to get %s reset\n", name);

			return PTR_ERR(rst);

		}

		qmp->resets[i] = rst;

	}

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

	if (ret)

		return dev_err_probe(dev, ret, "failed to get resets\n");



	return 0;

}