[PATCH v1] arm64: dts: qcom: sm8350: Use 2 interconnect cells

[PATCH v1] arm64: dts: qcom: sm8350: Use 2 interconnect cells

[rfoss]

From: Robert Foss <robert.foss@linaro.org>

Use two interconnect cells in order to optionally
support a path tag.

Signed-off-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm8350.dtsi | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
index fafd92edc855..20e3f1df70ad 100644
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -1548,56 +1548,56 @@ apps_smmu: iommu@15000000 {
 		config_noc: interconnect@1500000 {
 			compatible = "qcom,sm8350-config-noc";
 			reg = <0 0x01500000 0 0xa580>;
-			#interconnect-cells = <1>;
+			#interconnect-cells = <2>;
 			qcom,bcm-voters = <&apps_bcm_voter>;
 		};
 
 		mc_virt: interconnect@1580000 {
 			compatible = "qcom,sm8350-mc-virt";
 			reg = <0 0x01580000 0 0x1000>;
-			#interconnect-cells = <1>;
+			#interconnect-cells = <2>;
 			qcom,bcm-voters = <&apps_bcm_voter>;
 		};
 
 		system_noc: interconnect@1680000 {
 			compatible = "qcom,sm8350-system-noc";
 			reg = <0 0x01680000 0 0x1c200>;
-			#interconnect-cells = <1>;
+			#interconnect-cells = <2>;
 			qcom,bcm-voters = <&apps_bcm_voter>;
 		};
 
 		aggre1_noc: interconnect@16e0000 {
 			compatible = "qcom,sm8350-aggre1-noc";
 			reg = <0 0x016e0000 0 0x1f180>;
-			#interconnect-cells = <1>;
+			#interconnect-cells = <2>;
 			qcom,bcm-voters = <&apps_bcm_voter>;
 		};
 
 		aggre2_noc: interconnect@1700000 {
 			compatible = "qcom,sm8350-aggre2-noc";
 			reg = <0 0x01700000 0 0x33000>;
-			#interconnect-cells = <1>;
+			#interconnect-cells = <2>;
 			qcom,bcm-voters = <&apps_bcm_voter>;
 		};
 
 		mmss_noc: interconnect@1740000 {
 			compatible = "qcom,sm8350-mmss-noc";
 			reg = <0 0x01740000 0 0x1f080>;
-			#interconnect-cells = <1>;
+			#interconnect-cells = <2>;
 			qcom,bcm-voters = <&apps_bcm_voter>;
 		};
 
 		lpass_ag_noc: interconnect@3c40000 {
 			compatible = "qcom,sm8350-lpass-ag-noc";
 			reg = <0 0x03c40000 0 0xf080>;
-			#interconnect-cells = <1>;
+			#interconnect-cells = <2>;
 			qcom,bcm-voters = <&apps_bcm_voter>;
 		};
 
 		compute_noc: interconnect@a0c0000 {
 			compatible = "qcom,sm8350-compute-noc";
 			reg = <0 0x0a0c0000 0 0xa180>;
-			#interconnect-cells = <1>;
+			#interconnect-cells = <2>;
 			qcom,bcm-voters = <&apps_bcm_voter>;
 		};
 
@@ -1625,8 +1625,8 @@ ipa: ipa@1e40000 {
 			clocks = <&rpmhcc RPMH_IPA_CLK>;
 			clock-names = "core";
 
-			interconnects = <&aggre2_noc MASTER_IPA &mc_virt SLAVE_EBI1>,
-					<&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_IPA_CFG>;
+			interconnects = <&aggre2_noc MASTER_IPA 0 &mc_virt SLAVE_EBI1 0>,
+					<&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_IPA_CFG 0>;
 			interconnect-names = "memory",
 					     "config";
 
@@ -1666,7 +1666,7 @@ mpss: remoteproc@4080000 {
 					<&rpmhpd SM8350_MSS>;
 			power-domain-names = "cx", "mss";
 
-			interconnects = <&mc_virt MASTER_LLCC &mc_virt SLAVE_EBI1>;
+			interconnects = <&mc_virt MASTER_LLCC 0 &mc_virt SLAVE_EBI1 0>;
 
 			memory-region = <&pil_modem_mem>;
 
@@ -2284,7 +2284,7 @@ cdsp: remoteproc@98900000 {
 					<&rpmhpd SM8350_MXC>;
 			power-domain-names = "cx", "mxc";
 
-			interconnects = <&compute_noc MASTER_CDSP_PROC &mc_virt SLAVE_EBI1>;
+			interconnects = <&compute_noc MASTER_CDSP_PROC 0 &mc_virt SLAVE_EBI1 0>;
 
 			memory-region = <&pil_cdsp_mem>;
 
@@ -2505,14 +2505,14 @@ usb_2_ssphy: phy@88ebe00 {
 		dc_noc: interconnect@90c0000 {
 			compatible = "qcom,sm8350-dc-noc";
 			reg = <0 0x090c0000 0 0x4200>;
-			#interconnect-cells = <1>;
+			#interconnect-cells = <2>;
 			qcom,bcm-voters = <&apps_bcm_voter>;
 		};
 
 		gem_noc: interconnect@9100000 {
 			compatible = "qcom,sm8350-gem-noc";
 			reg = <0 0x09100000 0 0xb4000>;
-			#interconnect-cells = <1>;
+			#interconnect-cells = <2>;
 			qcom,bcm-voters = <&apps_bcm_voter>;
 		};
 
-- 
2.34.1

Re: [PATCH v1] arm64: dts: qcom: sm8350: Use 2 interconnect cells

[Bjorn Andersson]

On Tue, 17 Jan 2023 12:57:11 +0100, rfoss@kernel.org wrote:
> From: Robert Foss <robert.foss@linaro.org>
> 
> Use two interconnect cells in order to optionally
> support a path tag.
> 
> 

Applied, thanks!

[1/1] arm64: dts: qcom: sm8350: Use 2 interconnect cells
      commit: 4f287e31ff5f464526651ee3cb3fd3e96b2e5746

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>

Re: [PATCH v1] arm64: dts: qcom: sm8350: Use 2 interconnect cells

[Krzysztof Kozlowski]

On 19/01/2023 00:55, Bjorn Andersson wrote:
> On Tue, 17 Jan 2023 12:57:11 +0100, rfoss@kernel.org wrote:
>> From: Robert Foss <robert.foss@linaro.org>
>>
>> Use two interconnect cells in order to optionally
>> support a path tag.
>>
>>
> 
> Applied, thanks!
> 
> [1/1] arm64: dts: qcom: sm8350: Use 2 interconnect cells
>       commit: 4f287e31ff5f464526651ee3cb3fd3e96b2e5746


I don't think this is correct patch. We talked that this must be rebased
on my interconnect cells change and I think it wasn't :(

Best regards,
Krzysztof

Re: [PATCH v1] arm64: dts: qcom: sm8350: Use 2 interconnect cells

[Krzysztof Kozlowski]

On 19/01/2023 11:50, Krzysztof Kozlowski wrote:
> On 19/01/2023 00:55, Bjorn Andersson wrote:
>> On Tue, 17 Jan 2023 12:57:11 +0100, rfoss@kernel.org wrote:
>>> From: Robert Foss <robert.foss@linaro.org>
>>>
>>> Use two interconnect cells in order to optionally
>>> support a path tag.
>>>
>>>
>>
>> Applied, thanks!
>>
>> [1/1] arm64: dts: qcom: sm8350: Use 2 interconnect cells
>>       commit: 4f287e31ff5f464526651ee3cb3fd3e96b2e5746
> 
> 
> I don't think this is correct patch. We talked that this must be rebased
> on my interconnect cells change and I think it wasn't :(

Ah, let's just fix it with one more patch:

https://lore.kernel.org/linux-arm-msm/20230119105434.51635-1-krzysztof.kozlowski@linaro.org/T/#u

Best regards,
Krzysztof