Skip to content

Commit 19f837a

Browse files
konradybciogregkh
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 51b6148 commit 19f837a

File tree

1 file changed

+4
-23
lines changed

1 file changed

+4
-23
lines changed

arch/arm64/boot/dts/qcom/msm8996.dtsi

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -799,9 +799,6 @@
799799
compatible = "qcom,msm8996-bimc";
800800
reg = <0x00408000 0x5a000>;
801801
#interconnect-cells = <1>;
802-
clock-names = "bus", "bus_a";
803-
clocks = <&rpmcc RPM_SMD_BIMC_CLK>,
804-
<&rpmcc RPM_SMD_BIMC_A_CLK>;
805802
};
806803

807804
tsens0: thermal-sensor@4a9000 {
@@ -852,18 +849,12 @@
852849
compatible = "qcom,msm8996-cnoc";
853850
reg = <0x00500000 0x1000>;
854851
#interconnect-cells = <1>;
855-
clock-names = "bus", "bus_a";
856-
clocks = <&rpmcc RPM_SMD_CNOC_CLK>,
857-
<&rpmcc RPM_SMD_CNOC_A_CLK>;
858852
};
859853

860854
snoc: interconnect@524000 {
861855
compatible = "qcom,msm8996-snoc";
862856
reg = <0x00524000 0x1c000>;
863857
#interconnect-cells = <1>;
864-
clock-names = "bus", "bus_a";
865-
clocks = <&rpmcc RPM_SMD_SNOC_CLK>,
866-
<&rpmcc RPM_SMD_SNOC_A_CLK>;
867858
};
868859

869860
a0noc: interconnect@543000 {
@@ -883,39 +874,29 @@
883874
compatible = "qcom,msm8996-a1noc";
884875
reg = <0x00562000 0x5000>;
885876
#interconnect-cells = <1>;
886-
clock-names = "bus", "bus_a";
887-
clocks = <&rpmcc RPM_SMD_AGGR1_NOC_CLK>,
888-
<&rpmcc RPM_SMD_AGGR1_NOC_A_CLK>;
889877
};
890878

891879
a2noc: interconnect@583000 {
892880
compatible = "qcom,msm8996-a2noc";
893881
reg = <0x00583000 0x7000>;
894882
#interconnect-cells = <1>;
895-
clock-names = "bus", "bus_a", "aggre2_ufs_axi", "ufs_axi";
896-
clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>,
897-
<&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>,
898-
<&gcc GCC_AGGRE2_UFS_AXI_CLK>,
883+
clock-names = "aggre2_ufs_axi", "ufs_axi";
884+
clocks = <&gcc GCC_AGGRE2_UFS_AXI_CLK>,
899885
<&gcc GCC_UFS_AXI_CLK>;
900886
};
901887

902888
mnoc: interconnect@5a4000 {
903889
compatible = "qcom,msm8996-mnoc";
904890
reg = <0x005a4000 0x1c000>;
905891
#interconnect-cells = <1>;
906-
clock-names = "bus", "bus_a", "iface";
907-
clocks = <&rpmcc RPM_SMD_MMAXI_CLK>,
908-
<&rpmcc RPM_SMD_MMAXI_A_CLK>,
909-
<&mmcc AHB_CLK_SRC>;
892+
clock-names = "iface";
893+
clocks = <&mmcc AHB_CLK_SRC>;
910894
};
911895

912896
pnoc: interconnect@5c0000 {
913897
compatible = "qcom,msm8996-pnoc";
914898
reg = <0x005c0000 0x3000>;
915899
#interconnect-cells = <1>;
916-
clock-names = "bus", "bus_a";
917-
clocks = <&rpmcc RPM_SMD_PCNOC_CLK>,
918-
<&rpmcc RPM_SMD_PCNOC_A_CLK>;
919900
};
920901

921902
tcsr_mutex: hwlock@740000 {

0 commit comments

Comments
 (0)