summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-09-09 11:53:11 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-09-09 11:53:10 -0700
commitf479b5032cab7da452d59464d14e188f06ec3e19 (patch)
treec7e2754297c72efdf707f7276a961f194ec9bec6 /arch
parent04eb468f0ae971f96f25f9bd1c97dc8e4be5c8ee (diff)
parent4fc5e09f7017d10e7d08097a42fd3dd05768e3ad (diff)
Merge "clk: msm: clock-osm: Add measurement support for CPU clocks"
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/qcom/msmcobalt.dtsi10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi
index 8f4dc00101c5..820e70a6d9a6 100644
--- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi
+++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi
@@ -808,9 +808,10 @@
<0x17916000 0x1000>,
<0x17816000 0x1000>,
<0x179d1000 0x1000>,
- <0x00784130 0x8>;
+ <0x00784130 0x8>,
+ <0x1791101c 0x8>;
reg-names = "osm", "pwrcl_pll", "perfcl_pll",
- "apcs_common", "perfcl_efuse";
+ "apcs_common", "perfcl_efuse", "debug";
vdd-pwrcl-supply = <&apc0_pwrcl_vreg>;
vdd-perfcl-supply = <&apc1_perfcl_vreg>;
@@ -943,10 +944,11 @@
reg = <0x162000 0x4>;
reg-names = "cc_base";
clock-names = "debug_gpu_clk", "debug_gfx_clk",
- "debug_mmss_clk";
+ "debug_mmss_clk", "debug_cpu_clk";
clocks = <&clock_gpu clk_gpucc_gcc_dbg_clk>,
<&clock_gfx clk_gfxcc_dbg_clk>,
- <&clock_mmss clk_mmss_debug_mux>;
+ <&clock_mmss clk_mmss_debug_mux>,
+ <&clock_cpu clk_cpu_debug_mux>;
#clock-cells = <1>;
};