Merge changes I4a41aacb,Ic11513d4 into kernel.lnx.6.6.r1-rel

* changes:
  ARM: dts: msm: Update videocc clock node as GenPD provider on Kera
  ARM: dts: msm: Add support for RPMHCC and DEBUGCC on Kera platform
This commit is contained in:
Linux Build Service Account
2024-12-27 10:37:34 -08:00
committed by Gerrit - the friendly Code Review server
2 changed files with 61 additions and 9 deletions

View File

@@ -158,3 +158,17 @@
&APSS_OFF { &APSS_OFF {
status = "disabled"; status = "disabled";
}; };
&rpmhcc {
compatible = "fixed-clock";
clock-output-names = "rpmh_clocks";
clock-frequency = <19200000>;
};
&video_cc_mvs0_gdsc {
status = "ok";
};
&video_cc_mvs0c_gdsc {
status = "ok";
};

View File

@@ -636,6 +636,11 @@
qcom,llcc-bcm-name = "SH5"; qcom,llcc-bcm-name = "SH5";
}; };
rpmhcc: clock-controller {
compatible = "qcom,tuna-rpmh-clk";
#clock-cells = <1>;
};
}; };
}; };
@@ -1732,13 +1737,6 @@
}; };
}; };
rpmhcc: clock-controller {
compatible = "fixed-clock";
clock-output-names = "rpmh_clocks";
clock-frequency = <19200000>;
#clock-cells = <1>;
};
cambistmclkcc: clock-controller@1760000 { cambistmclkcc: clock-controller@1760000 {
compatible = "qcom,tuna-cambistmclkcc", "syscon"; compatible = "qcom,tuna-cambistmclkcc", "syscon";
reg = <0x1760000 0x6000>; reg = <0x1760000 0x6000>;
@@ -1874,6 +1872,7 @@
reg-name = "cc_base"; reg-name = "cc_base";
vdd_mm-supply = <&VDD_CX_LEVEL>; vdd_mm-supply = <&VDD_CX_LEVEL>;
vdd_mxc-supply = <&VDD_MX_LEVEL>; vdd_mxc-supply = <&VDD_MX_LEVEL>;
vdd_mm_mxc_voter-supply = <&VDD_CX_LEVEL>;
clocks = <&rpmhcc RPMH_CXO_CLK>, clocks = <&rpmhcc RPMH_CXO_CLK>,
<&rpmhcc RPMH_CXO_CLK_A>, <&rpmhcc RPMH_CXO_CLK_A>,
<&sleep_clk>, <&sleep_clk>,
@@ -1884,6 +1883,7 @@
"iface"; "iface";
#clock-cells = <1>; #clock-cells = <1>;
#reset-cells = <1>; #reset-cells = <1>;
#power-domain-cells = <1>;
}; };
qti,smmu-proxy { qti,smmu-proxy {
@@ -3082,6 +3082,46 @@
qcom,count-unit = <0x10000>; qcom,count-unit = <0x10000>;
qcom,target-dev = <&qcom_ddr_dcvs_hw>; qcom,target-dev = <&qcom_ddr_dcvs_hw>;
}; };
apsscc: syscon@17a80000 {
compatible = "syscon";
reg = <0x17a80000 0x21000>;
};
mccc: syscon@240ba000 {
compatible = "syscon";
reg = <0x240ba000 0x800>;
};
debugcc: clock-controller@0 {
compatible = "qcom,kera-debugcc";
qcom,apsscc = <&apsscc>;
qcom,cambistmclkcc = <&cambistmclkcc>;
qcom,camcc = <&camcc>;
qcom,dispcc = <&dispcc>;
qcom,gcc = <&gcc>;
qcom,gpucc = <&gpucc>;
qcom,tcsrcc = <&tcsrcc>;
qcom,videocc = <&videocc>;
qcom,mccc = <&mccc>;
clocks = <&rpmhcc RPMH_CXO_CLK>,
<&cambistmclkcc 0>,
<&camcc 0>,
<&dispcc 0>,
<&gcc 0>,
<&gpucc 0>,
<&tcsrcc 0>,
<&videocc 0>;
clock-names = "xo_clk_src",
"cambistmclkcc",
"camcc",
"dispcc",
"gcc",
"gpucc",
"tcsrcc",
"videocc";
#clock-cells = <1>;
};
}; };
#include "tuna-gdsc.dtsi" #include "tuna-gdsc.dtsi"
@@ -3194,14 +3234,12 @@
&video_cc_mvs0_gdsc { &video_cc_mvs0_gdsc {
clocks = <&gcc GCC_VIDEO_AHB_CLK>; clocks = <&gcc GCC_VIDEO_AHB_CLK>;
clock-names = "ahb_clk"; clock-names = "ahb_clk";
status = "ok";
}; };
&video_cc_mvs0c_gdsc { &video_cc_mvs0c_gdsc {
clocks = <&gcc GCC_VIDEO_AHB_CLK>; clocks = <&gcc GCC_VIDEO_AHB_CLK>;
clock-names = "ahb_clk"; clock-names = "ahb_clk";
parent-supply = <&VDD_CX_LEVEL>; parent-supply = <&VDD_CX_LEVEL>;
status = "ok";
}; };
&reserved_memory { &reserved_memory {