Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31543ebb authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Stephen Boyd
Browse files

clk: qcom: Register the gdscs before the clocks 



We have atleast some instances of ALWAYS_ON gdscs, which need to
be turned ON *before* some clocks within the gdsc domain marked
with a CLK_IS_CRITICAL can be turned ON.
To facilitate this sequence, register the GDCSs (and hence handle
the ALWAYS_ON gdscs) before we register clocks (and handle the
clocks marked as CLK_IS_CRITICAL)

Signed-off-by: default avatarRajendra Nayak <rnayak@codeaurora.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Tested-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent fb55bea1

drivers/clk/qcom/common.c

+16 −16
Original line number Diff line number Diff line
@@ -228,22 +228,6 @@ int qcom_cc_really_probe(struct platform_device *pdev, 
	if (!cc)

		return -ENOMEM;



	cc->rclks = rclks;

	cc->num_rclks = num_clks;



	for (i = 0; i < num_clks; i++) {

		if (!rclks[i])

			continue;



		ret = devm_clk_register_regmap(dev, rclks[i]);

		if (ret)

			return ret;

	}



	ret = devm_of_clk_add_hw_provider(dev, qcom_cc_clk_hw_get, cc);

	if (ret)

		return ret;



	reset = &cc->reset;

	reset->rcdev.of_node = dev->of_node;

	reset->rcdev.ops = &qcom_reset_ops;
@@ -272,6 +256,22 @@ int qcom_cc_really_probe(struct platform_device *pdev, 
			return ret;

	}



	cc->rclks = rclks;

	cc->num_rclks = num_clks;



	for (i = 0; i < num_clks; i++) {

		if (!rclks[i])

			continue;



		ret = devm_clk_register_regmap(dev, rclks[i]);

		if (ret)

			return ret;

	}



	ret = devm_of_clk_add_hw_provider(dev, qcom_cc_clk_hw_get, cc);

	if (ret)

		return ret;



	return 0;

}

EXPORT_SYMBOL_GPL(qcom_cc_really_probe);