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

phy: qcom-qmp-combo: drop pipe clock lane suffix 



The pipe clock is defined in the "lane" node so there's no need to keep
adding a redundant lane-number suffix to the clock name.

Update driver to support the new binding where the pipe clock name has
been deprecated by instead requesting the clock by index.

Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20220830112923.3725-28-johan+linaro@kernel.org


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

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

+1 −3
Original line number Diff line number Diff line
@@ -2723,7 +2723,6 @@ int qcom_qmp_phy_combo_create(struct device *dev, struct device_node *np, int id 
	struct phy *generic_phy;

	struct qmp_phy *qphy;

	const struct phy_ops *ops;

	char prop_name[MAX_PROP_NAME];

	int ret;



	qphy = devm_kzalloc(dev, sizeof(*qphy), GFP_KERNEL);
@@ -2789,8 +2788,7 @@ int qcom_qmp_phy_combo_create(struct device *dev, struct device_node *np, int id 
	 * Otherwise, we initialize pipe clock to NULL for

	 * all phys that don't need this.

	 */

	snprintf(prop_name, sizeof(prop_name), "pipe%d", id);

	qphy->pipe_clk = devm_get_clk_from_child(dev, np, prop_name);

	qphy->pipe_clk = devm_get_clk_from_child(dev, np, NULL);

	if (IS_ERR(qphy->pipe_clk)) {

		if (cfg->type == PHY_TYPE_USB3) {

			ret = PTR_ERR(qphy->pipe_clk);