diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-10 12:27:05 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-10 12:27:05 -0800 |
| commit | 8bfd4fdbf30da2dc59faa5a6b69d6862bc7078db (patch) | |
| tree | 849afeb4fa7c6ef4255cabef0133dd1c1b2f9dd4 /arch | |
| parent | 61b8d2d06893497fa6c04e08030c898e64b33b88 (diff) | |
| parent | 6a6c25411593b7742098f7fdd937c6f98974bae9 (diff) | |
Merge "clk: qcom: Add support to register GPU rbcpr clocks"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm660-gpu.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm660-regulator.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm660.dtsi | 9 |
3 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm660-gpu.dtsi b/arch/arm/boot/dts/qcom/sdm660-gpu.dtsi index 5c11131b9ddf..e3a3835ae809 100644 --- a/arch/arm/boot/dts/qcom/sdm660-gpu.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660-gpu.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -76,7 +76,7 @@ <&clock_gfx GPUCC_RBBMTIMER_CLK>, <&clock_gcc GCC_GPU_BIMC_GFX_CLK>, <&clock_gcc GCC_GPU_BIMC_GFX_SRC_CLK>, - <&clock_gfx GPUCC_RBCPR_CLK>; + <&clock_gpu GPUCC_RBCPR_CLK>; clock-names = "core_clk", "iface_clk", "rbbmtimer_clk", "mem_clk", "mem_iface_clk", "rbcpr_clk"; diff --git a/arch/arm/boot/dts/qcom/sdm660-regulator.dtsi b/arch/arm/boot/dts/qcom/sdm660-regulator.dtsi index 479a9fdd91ca..c00595934cf0 100644 --- a/arch/arm/boot/dts/qcom/sdm660-regulator.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660-regulator.dtsi @@ -532,7 +532,7 @@ compatible = "qcom,cpr4-sdm660-mmss-ldo-regulator"; reg = <0x05061000 0x4000>, <0x00784000 0x1000>; reg-names = "cpr_ctrl", "fuse_base"; - clocks = <&clock_gfx GPUCC_RBCPR_CLK>, + clocks = <&clock_gpu GPUCC_RBCPR_CLK>, <&clock_rpmcc RPM_CNOC_CLK>; clock-names = "core_clk", "bus_clk"; interrupts = <GIC_SPI 285 IRQ_TYPE_EDGE_RISING>; diff --git a/arch/arm/boot/dts/qcom/sdm660.dtsi b/arch/arm/boot/dts/qcom/sdm660.dtsi index 54aa729352a3..4a13675a07bb 100644 --- a/arch/arm/boot/dts/qcom/sdm660.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660.dtsi @@ -906,7 +906,14 @@ #reset-cells = <1>; }; - clock_gfx: clock-controller@5065000 { + clock_gpu: clock-controller@5065000 { + compatible = "qcom,gpu-sdm660"; + reg = <0x5065000 0x10000>; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + clock_gfx: gfx@5065000 { compatible = "qcom,gpucc-sdm660"; reg = <0x5065000 0x10000>; vdd_dig_gfx-supply = <&pm660l_s3_level>; |