arm64: dts: qcom: msm8996: 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: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230721-topic-rpm_clk_cleanup-v3-3-a66e698932e3@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 6ba9da9e6a8b993f912a813bf44308f235cc0dcf..587e9b50a256e4fdd4b47e418b07025fbc9b9278 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -799,9 +799,6 @@
                        compatible = "qcom,msm8996-bimc";
                        reg = <0x00408000 0x5a000>;
                        #interconnect-cells = <1>;
-                       clock-names = "bus", "bus_a";
-                       clocks = <&rpmcc RPM_SMD_BIMC_CLK>,
-                                <&rpmcc RPM_SMD_BIMC_A_CLK>;
                };
 
                tsens0: thermal-sensor@4a9000 {
@@ -852,18 +849,12 @@
                        compatible = "qcom,msm8996-cnoc";
                        reg = <0x00500000 0x1000>;
                        #interconnect-cells = <1>;
-                       clock-names = "bus", "bus_a";
-                       clocks = <&rpmcc RPM_SMD_CNOC_CLK>,
-                                <&rpmcc RPM_SMD_CNOC_A_CLK>;
                };
 
                snoc: interconnect@524000 {
                        compatible = "qcom,msm8996-snoc";
                        reg = <0x00524000 0x1c000>;
                        #interconnect-cells = <1>;
-                       clock-names = "bus", "bus_a";
-                       clocks = <&rpmcc RPM_SMD_SNOC_CLK>,
-                                <&rpmcc RPM_SMD_SNOC_A_CLK>;
                };
 
                a0noc: interconnect@543000 {
@@ -883,19 +874,14 @@
                        compatible = "qcom,msm8996-a1noc";
                        reg = <0x00562000 0x5000>;
                        #interconnect-cells = <1>;
-                       clock-names = "bus", "bus_a";
-                       clocks = <&rpmcc RPM_SMD_AGGR1_NOC_CLK>,
-                                <&rpmcc RPM_SMD_AGGR1_NOC_A_CLK>;
                };
 
                a2noc: interconnect@583000 {
                        compatible = "qcom,msm8996-a2noc";
                        reg = <0x00583000 0x7000>;
                        #interconnect-cells = <1>;
-                       clock-names = "bus", "bus_a", "aggre2_ufs_axi", "ufs_axi";
-                       clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>,
-                                <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>,
-                                <&gcc GCC_AGGRE2_UFS_AXI_CLK>,
+                       clock-names = "aggre2_ufs_axi", "ufs_axi";
+                       clocks = <&gcc GCC_AGGRE2_UFS_AXI_CLK>,
                                 <&gcc GCC_UFS_AXI_CLK>;
                };
 
@@ -903,19 +889,14 @@
                        compatible = "qcom,msm8996-mnoc";
                        reg = <0x005a4000 0x1c000>;
                        #interconnect-cells = <1>;
-                       clock-names = "bus", "bus_a", "iface";
-                       clocks = <&rpmcc RPM_SMD_MMAXI_CLK>,
-                                <&rpmcc RPM_SMD_MMAXI_A_CLK>,
-                                <&mmcc AHB_CLK_SRC>;
+                       clock-names = "iface";
+                       clocks = <&mmcc AHB_CLK_SRC>;
                };
 
                pnoc: interconnect@5c0000 {
                        compatible = "qcom,msm8996-pnoc";
                        reg = <0x005c0000 0x3000>;
                        #interconnect-cells = <1>;
-                       clock-names = "bus", "bus_a";
-                       clocks = <&rpmcc RPM_SMD_PCNOC_CLK>,
-                                <&rpmcc RPM_SMD_PCNOC_A_CLK>;
                };
 
                tcsr_mutex: hwlock@740000 {