arm64: dts: qcom: sm8350: Use 2 interconnect cells

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>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230117115712.1054613-1-rfoss@kernel.org

diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
index b7e9677..76515eb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -1531,42 +1531,42 @@
                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>;
                };
 
@@ -1751,14 +1751,14 @@
                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>;
                };
 
@@ -1786,8 +1786,8 @@
                        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";
 
@@ -1827,7 +1827,7 @@
                                        <&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>;
 
@@ -2446,7 +2446,7 @@
                                        <&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>;
 
@@ -2667,14 +2667,14 @@
                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>;
                };