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

Commit 96009aa5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: msm: clock-gpu-cobalt: Use the xo_ao source for GPUCC"

parents e1a51e72 36bdc173

arch/arm/boot/dts/qcom/msmcobalt.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -413,8 +413,8 @@ 
		vdd_dig-supply = <&pmcobalt_s1_level>;

		vdd_mx-supply = <&pmcobalt_s9_level>;

		vdd_gpu_mx-supply = <&pmcobalt_s9_level>;

		clock-names = "xo", "gpll0";

		clocks = <&clock_gcc clk_cxo_clk_src>,

		clock-names = "xo_ao", "gpll0";

		clocks = <&clock_gcc clk_cxo_clk_src_ao>,

			<&clock_gcc clk_gpll0_out_main>;

		qcom,gfxfreq-speedbin0 =

			<	  0	 0			     0 >,

drivers/clk/msm/clock-gpu-cobalt.c

+2 −2
Original line number Diff line number Diff line
@@ -446,10 +446,10 @@ int msm_gpucc_cobalt_probe(struct platform_device *pdev) 
		return PTR_ERR(reg);

	}



	tmp = gpucc_xo.c.parent = devm_clk_get(&pdev->dev, "xo");

	tmp = gpucc_xo.c.parent = devm_clk_get(&pdev->dev, "xo_ao");

	if (IS_ERR(tmp)) {

		if (PTR_ERR(tmp) != -EPROBE_DEFER)

			dev_err(&pdev->dev, "Unable to get xo clock\n");

			dev_err(&pdev->dev, "Unable to get xo_ao clock\n");

		return PTR_ERR(tmp);

	}