[04/11] arm64: dts: qcom: sdm630: Drop RPM bus clocks

Message ID	20230721-topic-rpm_clk_cleanup-v1-4-cf6cd5c621d5@linaro.org
State	New
Headers	show Return-Path: <linux-arm-msm-owner@vger.kernel.org> From: Konrad Dybcio <konrad.dybcio@linaro.org> Date: Fri, 21 Jul 2023 17:36:07 +0200 Subject: [PATCH 04/11] arm64: dts: qcom: sdm630: Drop RPM bus clocks MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230721-topic-rpm_clk_cleanup-v1-4-cf6cd5c621d5@linaro.org> References: <20230721-topic-rpm_clk_cleanup-v1-0-cf6cd5c621d5@linaro.org> In-Reply-To: <20230721-topic-rpm_clk_cleanup-v1-0-cf6cd5c621d5@linaro.org> To: Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Mathieu Poirier <mathieu.poirier@linaro.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Manivannan Sadhasivam <mani@kernel.org>, Sibi Sankar <quic_sibis@quicinc.com> Cc: Marijn Suijten <marijn.suijten@somainline.org>, linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio <konrad.dybcio@linaro.org> Precedence: bulk
Series	Clean up RPM bus clocks remnants \| expand [00/11] Clean up RPM bus clocks remnants [01/11] arm64: dts: qcom: msm8916: Drop RPM bus clocks [02/11] arm64: dts: qcom: msm8996: Drop RPM bus clocks [03/11] arm64: dts: qcom: qcs404: Drop RPM bus clocks [04/11] arm64: dts: qcom: sdm630: Drop RPM bus clocks [05/11] arm64: dts: qcom: msm8939: Drop RPM bus clocks [06/11] dt-bindings: remoteproc: qcom,adsp: Remove AGGRE2 clock [07/11] dt-bindings: remoteproc: qcom,msm8996-mss-pil: Remove PNoC clock [08/11] remoteproc: qcom: q6v5-mss: Remove PNoC clock from 8996 MSS [09/11] arm64: dts: qcom: msm8998: Remove AGGRE2 clock from SLPI [10/11] arm64: dts: qcom: msm8996: Remove AGGRE2 clock from SLPI [11/11] arm64: dts: qcom: msm8996: Remove PNoC clock from MSS

Message ID

20230721-topic-rpm_clk_cleanup-v1-4-cf6cd5c621d5@linaro.org

State

New

Headers

From: Konrad Dybcio <konrad.dybcio@linaro.org>
Date: Fri, 21 Jul 2023 17:36:07 +0200
Subject: [PATCH 04/11] arm64: dts: qcom: sdm630: Drop RPM bus clocks
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20230721-topic-rpm_clk_cleanup-v1-4-cf6cd5c621d5@linaro.org>
References: <20230721-topic-rpm_clk_cleanup-v1-0-cf6cd5c621d5@linaro.org>
In-Reply-To: <20230721-topic-rpm_clk_cleanup-v1-0-cf6cd5c621d5@linaro.org>
To: Andy Gross <agross@kernel.org>,
        Bjorn Andersson <andersson@kernel.org>,
        Mathieu Poirier <mathieu.poirier@linaro.org>,
        Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Conor Dooley <conor+dt@kernel.org>,
        Manivannan Sadhasivam <mani@kernel.org>,
        Sibi Sankar <quic_sibis@quicinc.com>
Cc: Marijn Suijten <marijn.suijten@somainline.org>,
        linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org,
        devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
        Konrad Dybcio <konrad.dybcio@linaro.org>
Precedence: bulk

Series

Clean up RPM bus clocks remnants | expand

Commit Message

Konrad Dybcio July 21, 2023, 3:36 p.m. UTC

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>
---
 arch/arm64/boot/dts/qcom/sdm630.dtsi | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

Comments

Krzysztof Kozlowski July 23, 2023, 2:08 p.m. UTC | #1

On 21/07/2023 17:36, 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@linaro.org>
> ---
>  arch/arm64/boot/dts/qcom/sdm630.dtsi | 29 ++++-------------------------
>  1 file changed, 4 insertions(+), 25 deletions(-)
> 

Are you sure you removed all of the instances? I think usb still has RPM
bus clocks.

Best regards,
Krzysztof

Konrad Dybcio Aug. 26, 2023, 11:55 a.m. UTC | #2

On 23.07.2023 16:08, Krzysztof Kozlowski wrote:
> On 21/07/2023 17:36, 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@linaro.org>
>> ---
>>  arch/arm64/boot/dts/qcom/sdm630.dtsi | 29 ++++-------------------------
>>  1 file changed, 4 insertions(+), 25 deletions(-)
>>
> 
> Are you sure you removed all of the instances? I think usb still has RPM
> bus clocks.
Yes, but Alexey submitted a patch [1] to remove that before I sent this

Guess I should have mentioned it..

Konrad

[1] https://lore.kernel.org/linux-arm-msm/20230719073520.2644966-1-alexeymin@postmarketos.org/

diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
index 83afce56a7b0..5403e34c6cdd 100644
--- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
@@ -605,9 +605,6 @@  bimc: interconnect@1008000 {
 			compatible = "qcom,sdm660-bimc";
 			reg = <0x01008000 0x78000>;
 			#interconnect-cells = <1>;
-			clock-names = "bus", "bus_a";
-			clocks = <&rpmcc RPM_SMD_BIMC_CLK>,
-				 <&rpmcc RPM_SMD_BIMC_A_CLK>;
 		};
 
 		restart@10ac000 {
@@ -619,18 +616,12 @@  cnoc: interconnect@1500000 {
 			compatible = "qcom,sdm660-cnoc";
 			reg = <0x01500000 0x10000>;
 			#interconnect-cells = <1>;
-			clock-names = "bus", "bus_a";
-			clocks = <&rpmcc RPM_SMD_CNOC_CLK>,
-				 <&rpmcc RPM_SMD_CNOC_A_CLK>;
 		};
 
 		snoc: interconnect@1626000 {
 			compatible = "qcom,sdm660-snoc";
 			reg = <0x01626000 0x7090>;
 			#interconnect-cells = <1>;
-			clock-names = "bus", "bus_a";
-			clocks = <&rpmcc RPM_SMD_SNOC_CLK>,
-				 <&rpmcc RPM_SMD_SNOC_A_CLK>;
 		};
 
 		anoc2_smmu: iommu@16c0000 {
@@ -685,16 +676,12 @@  a2noc: interconnect@1704000 {
 			compatible = "qcom,sdm660-a2noc";
 			reg = <0x01704000 0xc100>;
 			#interconnect-cells = <1>;
-			clock-names = "bus",
-				      "bus_a",
-				      "ipa",
+			clock-names = "ipa",
 				      "ufs_axi",
 				      "aggre2_ufs_axi",
 				      "aggre2_usb3_axi",
 				      "cfg_noc_usb2_axi";
-			clocks = <&rpmcc RPM_SMD_AGGR2_NOC_CLK>,
-				 <&rpmcc RPM_SMD_AGGR2_NOC_A_CLK>,
-				 <&rpmcc RPM_SMD_IPA_CLK>,
+			clocks = <&rpmcc RPM_SMD_IPA_CLK>,
 				 <&gcc GCC_UFS_AXI_CLK>,
 				 <&gcc GCC_AGGRE2_UFS_AXI_CLK>,
 				 <&gcc GCC_AGGRE2_USB3_AXI_CLK>,
@@ -705,10 +692,8 @@  mnoc: interconnect@1745000 {
 			compatible = "qcom,sdm660-mnoc";
 			reg = <0x01745000 0xa010>;
 			#interconnect-cells = <1>;
-			clock-names = "bus", "bus_a", "iface";
-			clocks = <&rpmcc RPM_SMD_MMSSNOC_AXI_CLK>,
-				 <&rpmcc RPM_SMD_MMSSNOC_AXI_CLK_A>,
-				 <&mmcc AHB_CLK_SRC>;
+			clock-names = "iface";
+			clocks = <&mmcc AHB_CLK_SRC>;
 		};
 
 		tsens: thermal-sensor@10ae000 {
@@ -2264,12 +2249,6 @@  gnoc: interconnect@17900000 {
 			compatible = "qcom,sdm660-gnoc";
 			reg = <0x17900000 0xe000>;
 			#interconnect-cells = <1>;
-			/*
-			 * This one apparently features no clocks,
-			 * so let's not mess with the driver needlessly
-			 */
-			clock-names = "bus", "bus_a";
-			clocks = <&xo_board>, <&xo_board>;
 		};
 
 		apcs_glb: mailbox@17911000 {

[04/11] arm64: dts: qcom: sdm630: Drop RPM bus clocks

Commit Message

Comments

Patch