Commit c64d39b4 authored by Johan Hovold's avatar Johan Hovold Committed by Vinod Koul
Browse files

phy: qcom-qmp-ufs: restructure PHY creation 



In preparation for supporting devicetree bindings which do not use a
child node, move the PHY creation to probe() proper and parse the serdes
resource in what is now the legacy devicetree helper.

Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20221024090041.19574-10-johan+linaro@kernel.org


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

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

+16 −18
Original line number Diff line number Diff line
@@ -983,12 +983,15 @@ static int qmp_ufs_clk_init(struct qmp_ufs *qmp) 
	return devm_clk_bulk_get(dev, num, qmp->clks);

}



static int qmp_ufs_create(struct qmp_ufs *qmp, struct device_node *np)

static int qmp_ufs_parse_dt_legacy(struct qmp_ufs *qmp, struct device_node *np)

{

	struct platform_device *pdev = to_platform_device(qmp->dev);

	const struct qmp_phy_cfg *cfg = qmp->cfg;

	struct device *dev = qmp->dev;

	struct phy *generic_phy;

	int ret;



	qmp->serdes = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(qmp->serdes))

		return PTR_ERR(qmp->serdes);



	/*

	 * Get memory resources for the PHY:
@@ -1025,16 +1028,6 @@ static int qmp_ufs_create(struct qmp_ufs *qmp, struct device_node *np) 
	if (IS_ERR(qmp->pcs_misc))

		dev_vdbg(dev, "PHY pcs_misc-reg not used\n");



	generic_phy = devm_phy_create(dev, np, &qcom_qmp_ufs_phy_ops);

	if (IS_ERR(generic_phy)) {

		ret = PTR_ERR(generic_phy);

		dev_err(dev, "failed to create PHY: %d\n", ret);

		return ret;

	}



	qmp->phy = generic_phy;

	phy_set_drvdata(generic_phy, qmp);



	return 0;

}
@@ -1056,10 +1049,6 @@ static int qmp_ufs_probe(struct platform_device *pdev) 
	if (!qmp->cfg)

		return -EINVAL;



	qmp->serdes = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(qmp->serdes))

		return PTR_ERR(qmp->serdes);



	ret = qmp_ufs_clk_init(qmp);

	if (ret)

		return ret;
@@ -1072,10 +1061,19 @@ static int qmp_ufs_probe(struct platform_device *pdev) 
	if (!child)

		return -EINVAL;



	ret = qmp_ufs_create(qmp, child);

	ret = qmp_ufs_parse_dt_legacy(qmp, child);

	if (ret)

		goto err_node_put;



	qmp->phy = devm_phy_create(dev, child, &qcom_qmp_ufs_phy_ops);

	if (IS_ERR(qmp->phy)) {

		ret = PTR_ERR(qmp->phy);

		dev_err(dev, "failed to create PHY: %d\n", ret);

		goto err_node_put;

	}



	phy_set_drvdata(qmp->phy, qmp);



	of_node_put(child);



	phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);