diff options
| author | Deepak Katragadda <dkatraga@codeaurora.org> | 2016-02-29 11:20:26 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-25 16:02:50 -0700 |
| commit | 5dda28c7bd1bb077ef36068950e7a3870ce35e7b (patch) | |
| tree | 0616ea400bed13460ebc83a3b2769bab15aa51ae | |
| parent | 3ad47c7df0b436f03433899746fae748a690c86e (diff) | |
clk: msm: clock-gpu-cobalt: Use the xo_ao source for GPUCC
The root clock for all GPUCC clocks, gpucc_cxo_clk is currently
being sourced off the cxo_clk_src clock. This will not allow XO
shutdown to happen. Use the cxo_clk_src_ao instead.
CRs-Fixed: 983874
Change-Id: I7f8dd9ea28114d3d06fec3397064356b4deb6e7e
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt.dtsi | 4 | ||||
| -rw-r--r-- | drivers/clk/msm/clock-gpu-cobalt.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi index 090395d18116..51629b2200de 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi @@ -436,8 +436,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 >, diff --git a/drivers/clk/msm/clock-gpu-cobalt.c b/drivers/clk/msm/clock-gpu-cobalt.c index c74ea4efb64c..cb57f8e824f9 100644 --- a/drivers/clk/msm/clock-gpu-cobalt.c +++ b/drivers/clk/msm/clock-gpu-cobalt.c @@ -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); } |