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

phy: qcom-qmp-combo: separate clock and provider registration 



In preparation for supporting devicetree bindings which do not use child
nodes, separate clock registration from clock-provider registration.

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/20221121085058.31213-10-johan+linaro@kernel.org


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

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

+20 −24
Original line number Diff line number Diff line
@@ -2243,7 +2243,6 @@ static int phy_pipe_clk_register(struct qmp_combo *qmp, struct device_node *np) 
	struct clk_fixed_rate *fixed = &qmp->pipe_clk_fixed;

	struct clk_init_data init = { };

	char name[64];

	int ret;



	snprintf(name, sizeof(name), "%s::pipe_clk", dev_name(qmp->dev));

	init.name = name;
@@ -2253,19 +2252,7 @@ static int phy_pipe_clk_register(struct qmp_combo *qmp, struct device_node *np) 
	fixed->fixed_rate = 125000000;

	fixed->hw.init = &init;



	ret = devm_clk_hw_register(qmp->dev, &fixed->hw);

	if (ret)

		return ret;



	ret = of_clk_add_hw_provider(np, of_clk_hw_simple_get, &fixed->hw);

	if (ret)

		return ret;



	/*

	 * Roll a devm action because the clock provider is the child node, but

	 * the child node is not actually a device.

	 */

	return devm_add_action_or_reset(qmp->dev, phy_clk_release_provider, np);

	return devm_clk_hw_register(qmp->dev, &fixed->hw);

}



/*
@@ -2436,15 +2423,7 @@ static int phy_dp_clks_register(struct qmp_combo *qmp, struct device_node *np) 
	if (ret)

		return ret;



	ret = of_clk_add_hw_provider(np, qcom_qmp_dp_clks_hw_get, qmp);

	if (ret)

		return ret;



	/*

	 * Roll a devm action because the clock provider is the child node, but

	 * the child node is not actually a device.

	 */

	return devm_add_action_or_reset(qmp->dev, phy_clk_release_provider, np);

	return 0;

}



static int qmp_combo_register_clocks(struct qmp_combo *qmp, struct device_node *usb_np,
@@ -2460,7 +2439,24 @@ static int qmp_combo_register_clocks(struct qmp_combo *qmp, struct device_node * 
	if (ret)

		return ret;



	return 0;

	ret = of_clk_add_hw_provider(usb_np, of_clk_hw_simple_get,

					&qmp->pipe_clk_fixed.hw);

	if (ret)

		return ret;



	/*

	 * Roll a devm action because the clock provider is the child node, but

	 * the child node is not actually a device.

	 */

	ret = devm_add_action_or_reset(qmp->dev, phy_clk_release_provider, usb_np);

	if (ret)

		return ret;



	ret = of_clk_add_hw_provider(dp_np, qcom_qmp_dp_clks_hw_get, qmp);

	if (ret)

		return ret;



	return devm_add_action_or_reset(qmp->dev, phy_clk_release_provider, dp_np);

}



static int qmp_combo_parse_dt_lecacy_dp(struct qmp_combo *qmp, struct device_node *np)