summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChetan C R <cchinnad@qti.qualcomm.com>2021-02-18 16:32:50 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2021-03-03 03:59:36 -0800
commit69df9b0e5250ff279f498e207f9ebd0ea62cd0e0 (patch)
treeb8564708067d1c2e1fa088432ef62338ff69320c
parentcdf2937c80eea0f3a4df76bee69923f88857babe (diff)
downloaddevicetree-69df9b0e5250ff279f498e207f9ebd0ea62cd0e0.tar.gz
ARM: dts: msm: Add CPU clock node for QM215
Add cpu clock controller support for QM215 targets. Change-Id: I9f29cf9424411be1a60016a4df4a0599c252f8f6
-rw-r--r--qcom/msm8917-thermal.dtsi2
-rw-r--r--qcom/msm8917.dtsi16
-rw-r--r--qcom/qm215-pm8916.dtsi8
3 files changed, 11 insertions, 15 deletions
diff --git a/qcom/msm8917-thermal.dtsi b/qcom/msm8917-thermal.dtsi
index 9933847c..7135a3d0 100644
--- a/qcom/msm8917-thermal.dtsi
+++ b/qcom/msm8917-thermal.dtsi
@@ -1,6 +1,6 @@
#include <dt-bindings/thermal/thermal.h>
-&clock_cpu {
+&apsscc {
qcom,cpu-isolation {
compatible = "qcom,cpu-isolate";
cpu0_isolate: cpu0-isolate {
diff --git a/qcom/msm8917.dtsi b/qcom/msm8917.dtsi
index 40bd992f..1d08fcce 100644
--- a/qcom/msm8917.dtsi
+++ b/qcom/msm8917.dtsi
@@ -1,6 +1,7 @@
#include "skeleton64.dtsi"
#include <dt-bindings/clock/qcom,gcc-sdm429w.h>
#include <dt-bindings/clock/mdss-28nm-pll-clk.h>
+#include <dt-bindings/clock/qcom,cpu-sdm.h>
#include <dt-bindings/clock/qcom,rpmcc.h>
#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
#include <dt-bindings/spmi/spmi.h>
@@ -586,13 +587,16 @@
#clock-cells = <1>;
};
- clock_cpu: qcom,cpu-clock-8939@b111050 {
- compatible = "qcom,cpu-clock-8917";
- reg = <0xb011050 0x8>,
+ apsscc: qcom,clock-cpu@b011050 {
+ compatible = "qcom,cpu-clock-qm215";
+ reg = <0xb011050 0x8>,
+ <0xb016000 0x34>,
<0x00a412c 0x8>;
- reg-names = "apcs-c1-rcg-base", "efuse";
- qcom,num-cluster;
- vdd-c1-supply = <&apc_vreg_corner>;
+ reg-names = "apcs-c1-rcg-base",
+ "apcs_pll", "efuse";
+ cpu-vdd-supply = <&apc_vreg_corner>;
+ vdd_dig_ao-supply = <&pm8916_s1_level_ao>;
+ vdd_hf_pll-supply = <&pm8916_l7_ao>;
clocks = <&rpmcc RPM_SMD_XO_A_CLK_SRC>,
<&gcc GPLL0_AO_OUT_MAIN>;
clock-names = "xo_ao", "gpll0_ao" ;
diff --git a/qcom/qm215-pm8916.dtsi b/qcom/qm215-pm8916.dtsi
index fa08b0f8..063224b2 100644
--- a/qcom/qm215-pm8916.dtsi
+++ b/qcom/qm215-pm8916.dtsi
@@ -36,10 +36,6 @@
};
};
- qcom,cpu-clock-8939@b111050 {
- /delete-property/ vdd-c1-supply;
- };
-
qcom,gcc@1800000 {
/delete-property/ vdd_cx-supply;
/delete-property/ vdd_hf_dig-supply;
@@ -194,10 +190,6 @@
};
};
-&clock_cpu {
- vdd-c1-supply = <&apc_vreg_corner>;
-};
-
&gcc {
vdd_cx-supply = <&pm8916_s1_level>;
vdd_hf_dig-supply = <&pm8916_s1_level_ao>;