On 12/09/2023 4:31 pm, Konrad Dybcio wrote:
> 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@xxxxxxxxxx>
> ---
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 27 ++++-----------------------
> 1 file changed, 4 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index c8e0986425ab..acef67ab0581 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -798,9 +798,6 @@ bimc: interconnect@408000 {
> 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 {
> @@ -851,18 +848,12 @@ cnoc: interconnect@500000 {
> 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 {
> @@ -882,19 +873,14 @@ a1noc: interconnect@562000 {
> 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>;
> };
>
> @@ -902,19 +888,14 @@ mnoc: interconnect@5a4000 {
> 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 {
Tested-by: Yassine Oudjana <y.oudjana@xxxxxxxxxxxxxx>
