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

Commit bb0fc62d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: camcc-kona: Conditionally configure pll2 based on v1/v2"

parents a43a8828 f6b164cb

drivers/clk/qcom/camcc-kona.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -2786,13 +2786,15 @@ static int cam_cc_kona_probe(struct platform_device *pdev) 




	clk_lucid_pll_configure(&cam_cc_pll0, regmap, &cam_cc_pll0_config);

	clk_lucid_pll_configure(&cam_cc_pll0, regmap, &cam_cc_pll0_config);

	clk_lucid_pll_configure(&cam_cc_pll1, regmap, &cam_cc_pll1_config);

	clk_lucid_pll_configure(&cam_cc_pll1, regmap, &cam_cc_pll1_config);

	clk_zonda_pll_configure(&cam_cc_pll2, regmap, &cam_cc_pll2_config);

	clk_lucid_pll_configure(&cam_cc_pll3, regmap, &cam_cc_pll3_config);

	clk_lucid_pll_configure(&cam_cc_pll3, regmap, &cam_cc_pll3_config);

	clk_lucid_pll_configure(&cam_cc_pll4, regmap, &cam_cc_pll4_config);

	clk_lucid_pll_configure(&cam_cc_pll4, regmap, &cam_cc_pll4_config);





	if (of_device_is_compatible(pdev->dev.of_node,

	if (of_device_is_compatible(pdev->dev.of_node,

				"qcom,camcc-kona-v2"))

				"qcom,camcc-kona-v2"))

		cam_cc_kona_fixup_konav2(regmap);

		cam_cc_kona_fixup_konav2(regmap);

	else

		clk_zonda_pll_configure(&cam_cc_pll2, regmap,

					&cam_cc_pll2_config);





	ret = qcom_cc_really_probe(pdev, &cam_cc_kona_desc, regmap);

	ret = qcom_cc_really_probe(pdev, &cam_cc_kona_desc, regmap);

	if (ret) {

	if (ret) {