Skip to content

Commit 6453ad0

Browse files
lumagandersson
authored andcommitted
ARM: dts: qcom: msm8974: Drop RPM bus clocks
Some nodes are abusingly referencing some of the internal bus clocks, that were recently removed in Linux (because the original implementation did not make much sense), managing them as if they were the only devices on an NoC bus. These clocks are now handled from within the icc framework and are no longer registered from within the CCF. Remove them. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Tested-by: Luca Weiss <luca.weiss@fairphone.com> # fairphone-fp2 Tested-by: Alexandre Messier <alex@me.ssier.org> Link: https://lore.kernel.org/r/20260324-msm8974-icc-v2-9-527280043ad8@oss.qualcomm.com Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 15ca411 commit 6453ad0

1 file changed

Lines changed: 3 additions & 18 deletions

File tree

arch/arm/boot/dts/qcom/qcom-msm8974.dtsi

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,9 +1115,6 @@
11151115
reg = <0xfc380000 0x6a000>;
11161116
compatible = "qcom,msm8974-bimc";
11171117
#interconnect-cells = <1>;
1118-
clock-names = "bus", "bus_a";
1119-
clocks = <&rpmcc RPM_SMD_BIMC_CLK>,
1120-
<&rpmcc RPM_SMD_BIMC_A_CLK>;
11211118
};
11221119

11231120
gcc: clock-controller@fc400000 {
@@ -1162,45 +1159,32 @@
11621159
reg = <0xfc460000 0x4000>;
11631160
compatible = "qcom,msm8974-snoc";
11641161
#interconnect-cells = <1>;
1165-
clock-names = "bus", "bus_a";
1166-
clocks = <&rpmcc RPM_SMD_SNOC_CLK>,
1167-
<&rpmcc RPM_SMD_SNOC_A_CLK>;
11681162
};
11691163

11701164
pnoc: interconnect@fc468000 {
11711165
reg = <0xfc468000 0x4000>;
11721166
compatible = "qcom,msm8974-pnoc";
11731167
#interconnect-cells = <1>;
1174-
clock-names = "bus", "bus_a";
1175-
clocks = <&rpmcc RPM_SMD_PNOC_CLK>,
1176-
<&rpmcc RPM_SMD_PNOC_A_CLK>;
11771168
};
11781169

11791170
ocmemnoc: interconnect@fc470000 {
11801171
reg = <0xfc470000 0x4000>;
11811172
compatible = "qcom,msm8974-ocmemnoc";
11821173
#interconnect-cells = <1>;
1183-
clock-names = "bus", "bus_a";
1184-
clocks = <&rpmcc RPM_SMD_OCMEMGX_CLK>,
1185-
<&rpmcc RPM_SMD_OCMEMGX_A_CLK>;
11861174
};
11871175

11881176
mmssnoc: interconnect@fc478000 {
11891177
reg = <0xfc478000 0x4000>;
11901178
compatible = "qcom,msm8974-mmssnoc";
11911179
#interconnect-cells = <1>;
1192-
clock-names = "bus", "bus_a";
1193-
clocks = <&mmcc MMSS_S0_AXI_CLK>,
1194-
<&mmcc MMSS_S0_AXI_CLK>;
1180+
clocks = <&mmcc MMSS_S0_AXI_CLK>;
1181+
clock-names = "bus";
11951182
};
11961183

11971184
cnoc: interconnect@fc480000 {
11981185
reg = <0xfc480000 0x4000>;
11991186
compatible = "qcom,msm8974-cnoc";
12001187
#interconnect-cells = <1>;
1201-
clock-names = "bus", "bus_a";
1202-
clocks = <&rpmcc RPM_SMD_CNOC_CLK>,
1203-
<&rpmcc RPM_SMD_CNOC_A_CLK>;
12041188
};
12051189

12061190
tsens: thermal-sensor@fc4a9000 {
@@ -2223,6 +2207,7 @@
22232207
<0xfec00000 0x180000>;
22242208
reg-names = "ctrl", "mem";
22252209
ranges = <0 0xfec00000 0x180000>;
2210+
/* core clock doesn't exist anymore, kept for ABI compliance */
22262211
clocks = <&rpmcc RPM_SMD_OCMEMGX_CLK>,
22272212
<&mmcc OCMEMCX_OCMEMNOC_CLK>;
22282213
clock-names = "core", "iface";

0 commit comments

Comments
 (0)