arm64: dts: qcom: sc7180: Increase the number of interconnect cells

Increase the number of interconnect-cells, as now we can include
the tag information. The consumers can specify the path tag as an
additional argument to the endpoints.

Signed-off-by: Sibi Sankar <sibis@codeaurora.org>
Tested-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
Link: https://lore.kernel.org/r/20200903133134.17201-8-georgi.djakov@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index ac90924..6678f1e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -133,7 +133,7 @@
                        capacity-dmips-mhz = <1024>;
                        dynamic-power-coefficient = <100>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC &mc_virt SLAVE_EBI1>,
+                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        next-level-cache = <&L2_0>;
                        #cooling-cells = <2>;
@@ -159,7 +159,7 @@
                        dynamic-power-coefficient = <100>;
                        next-level-cache = <&L2_100>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC &mc_virt SLAVE_EBI1>,
+                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
@@ -181,7 +181,7 @@
                        dynamic-power-coefficient = <100>;
                        next-level-cache = <&L2_200>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC &mc_virt SLAVE_EBI1>,
+                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
@@ -203,7 +203,7 @@
                        dynamic-power-coefficient = <100>;
                        next-level-cache = <&L2_300>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC &mc_virt SLAVE_EBI1>,
+                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
@@ -225,7 +225,7 @@
                        dynamic-power-coefficient = <100>;
                        next-level-cache = <&L2_400>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC &mc_virt SLAVE_EBI1>,
+                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
@@ -247,7 +247,7 @@
                        dynamic-power-coefficient = <100>;
                        next-level-cache = <&L2_500>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC &mc_virt SLAVE_EBI1>,
+                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
@@ -269,7 +269,7 @@
                        dynamic-power-coefficient = <405>;
                        next-level-cache = <&L2_600>;
                        operating-points-v2 = <&cpu6_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC &mc_virt SLAVE_EBI1>,
+                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 1>;
@@ -291,7 +291,7 @@
                        dynamic-power-coefficient = <405>;
                        next-level-cache = <&L2_700>;
                        operating-points-v2 = <&cpu6_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC &mc_virt SLAVE_EBI1>,
+                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
                                        <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 1>;
@@ -756,7 +756,7 @@
                        #size-cells = <2>;
                        ranges;
                        iommus = <&apps_smmu 0x43 0x0>;
-                       interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>;
+                       interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>;
                        interconnect-names = "qup-core";
                        status = "disabled";
 
@@ -770,9 +770,9 @@
                                interrupts = <GIC_SPI 601 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>,
-                                               <&aggre1_noc MASTER_QUP_0 &mc_virt SLAVE_EBI1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>,
+                                               <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config",
                                                        "qup-memory";
                                status = "disabled";
@@ -790,8 +790,8 @@
                                #size-cells = <0>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -806,8 +806,8 @@
                                interrupts = <GIC_SPI 601 IRQ_TYPE_LEVEL_HIGH>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -822,9 +822,9 @@
                                interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>,
-                                               <&aggre1_noc MASTER_QUP_0 &mc_virt SLAVE_EBI1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>,
+                                               <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config",
                                                        "qup-memory";
                                status = "disabled";
@@ -842,8 +842,8 @@
                                #size-cells = <0>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -858,8 +858,8 @@
                                interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -874,9 +874,9 @@
                                interrupts = <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>,
-                                               <&aggre1_noc MASTER_QUP_0 &mc_virt SLAVE_EBI1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>,
+                                               <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config",
                                                        "qup-memory";
                                status = "disabled";
@@ -892,8 +892,8 @@
                                interrupts = <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -908,9 +908,9 @@
                                interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>,
-                                               <&aggre1_noc MASTER_QUP_0 &mc_virt SLAVE_EBI1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>,
+                                               <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config",
                                                        "qup-memory";
                                status = "disabled";
@@ -928,8 +928,8 @@
                                #size-cells = <0>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -944,8 +944,8 @@
                                interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -960,9 +960,9 @@
                                interrupts = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>,
-                                               <&aggre1_noc MASTER_QUP_0 &mc_virt SLAVE_EBI1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>,
+                                               <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config",
                                                        "qup-memory";
                                status = "disabled";
@@ -978,8 +978,8 @@
                                interrupts = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -994,9 +994,9 @@
                                interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>,
-                                               <&aggre1_noc MASTER_QUP_0 &mc_virt SLAVE_EBI1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>,
+                                               <&aggre1_noc MASTER_QUP_0 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config",
                                                        "qup-memory";
                                status = "disabled";
@@ -1014,8 +1014,8 @@
                                #size-cells = <0>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -1030,8 +1030,8 @@
                                interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_0 &qup_virt SLAVE_QUP_CORE_0>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_0>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_0 0 &qup_virt SLAVE_QUP_CORE_0 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_0 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -1047,7 +1047,7 @@
                        #size-cells = <2>;
                        ranges;
                        iommus = <&apps_smmu 0x4c3 0x0>;
-                       interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>;
+                       interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>;
                        interconnect-names = "qup-core";
                        status = "disabled";
 
@@ -1061,9 +1061,9 @@
                                interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>,
-                                               <&aggre2_noc MASTER_QUP_1 &mc_virt SLAVE_EBI1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config",
                                                        "qup-memory";
                                status = "disabled";
@@ -1081,8 +1081,8 @@
                                #size-cells = <0>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -1097,8 +1097,8 @@
                                interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -1113,9 +1113,9 @@
                                interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>,
-                                               <&aggre2_noc MASTER_QUP_1 &mc_virt SLAVE_EBI1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config",
                                                        "qup-memory";
                                status = "disabled";
@@ -1131,8 +1131,8 @@
                                interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -1147,9 +1147,9 @@
                                interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>,
-                                               <&aggre2_noc MASTER_QUP_1 &mc_virt SLAVE_EBI1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config",
                                                        "qup-memory";
                                status = "disabled";
@@ -1167,8 +1167,8 @@
                                #size-cells = <0>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -1183,8 +1183,8 @@
                                interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -1199,9 +1199,9 @@
                                interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>,
-                                               <&aggre2_noc MASTER_QUP_1 &mc_virt SLAVE_EBI1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config",
                                                        "qup-memory";
                                status = "disabled";
@@ -1217,8 +1217,8 @@
                                interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -1233,9 +1233,9 @@
                                interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>,
-                                               <&aggre2_noc MASTER_QUP_1 &mc_virt SLAVE_EBI1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config",
                                                        "qup-memory";
                                status = "disabled";
@@ -1253,8 +1253,8 @@
                                #size-cells = <0>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -1269,8 +1269,8 @@
                                interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -1285,9 +1285,9 @@
                                interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>,
-                                               <&aggre2_noc MASTER_QUP_1 &mc_virt SLAVE_EBI1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>,
+                                               <&aggre2_noc MASTER_QUP_1 0 &mc_virt SLAVE_EBI1 0>;
                                interconnect-names = "qup-core", "qup-config",
                                                        "qup-memory";
                                status = "disabled";
@@ -1305,8 +1305,8 @@
                                #size-cells = <0>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -1321,8 +1321,8 @@
                                interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
                                power-domains = <&rpmhpd SC7180_CX>;
                                operating-points-v2 = <&qup_opp_table>;
-                               interconnects = <&qup_virt MASTER_QUP_CORE_1 &qup_virt SLAVE_QUP_CORE_1>,
-                                               <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_QUP_1>;
+                               interconnects = <&qup_virt MASTER_QUP_CORE_1 0 &qup_virt SLAVE_QUP_CORE_1 0>,
+                                               <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_QUP_1 0>;
                                interconnect-names = "qup-core", "qup-config";
                                status = "disabled";
                        };
@@ -1331,63 +1331,63 @@
                config_noc: interconnect@1500000 {
                        compatible = "qcom,sc7180-config-noc";
                        reg = <0 0x01500000 0 0x28000>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
                system_noc: interconnect@1620000 {
                        compatible = "qcom,sc7180-system-noc";
                        reg = <0 0x01620000 0 0x17080>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
                mc_virt: interconnect@1638000 {
                        compatible = "qcom,sc7180-mc-virt";
                        reg = <0 0x01638000 0 0x1000>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
                qup_virt: interconnect@1650000 {
                        compatible = "qcom,sc7180-qup-virt";
                        reg = <0 0x01650000 0 0x1000>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
                aggre1_noc: interconnect@16e0000 {
                        compatible = "qcom,sc7180-aggre1-noc";
                        reg = <0 0x016e0000 0 0x15080>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
                aggre2_noc: interconnect@1705000 {
                        compatible = "qcom,sc7180-aggre2-noc";
                        reg = <0 0x01705000 0 0x9000>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
                compute_noc: interconnect@170e000 {
                        compatible = "qcom,sc7180-compute-noc";
                        reg = <0 0x0170e000 0 0x6000>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
                mmss_noc: interconnect@1740000 {
                        compatible = "qcom,sc7180-mmss-noc";
                        reg = <0 0x01740000 0 0x1c100>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
                ipa_virt: interconnect@1e00000 {
                        compatible = "qcom,sc7180-ipa-virt";
                        reg = <0 0x01e00000 0 0x1000>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
@@ -1414,9 +1414,9 @@
                        clocks = <&rpmhcc RPMH_IPA_CLK>;
                        clock-names = "core";
 
-                       interconnects = <&aggre2_noc MASTER_IPA &mc_virt SLAVE_EBI1>,
-                                       <&aggre2_noc MASTER_IPA &system_noc SLAVE_IMEM>,
-                                       <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_IPA_CFG>;
+                       interconnects = <&aggre2_noc MASTER_IPA 0 &mc_virt SLAVE_EBI1 0>,
+                                       <&aggre2_noc MASTER_IPA 0 &system_noc SLAVE_IMEM 0>,
+                                       <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_IPA_CFG 0>;
                        interconnect-names = "memory",
                                             "imem",
                                             "config";
@@ -1907,7 +1907,7 @@
                        operating-points-v2 = <&gpu_opp_table>;
                        qcom,gmu = <&gmu>;
 
-                       interconnects = <&gem_noc MASTER_GFX3D &mc_virt SLAVE_EBI1>;
+                       interconnects = <&gem_noc MASTER_GFX3D 0 &mc_virt SLAVE_EBI1 0>;
                        interconnect-names = "gfx-mem";
 
                        gpu_opp_table: opp-table {
@@ -2581,8 +2581,8 @@
                        clocks = <&gcc GCC_QSPI_CNOC_PERIPH_AHB_CLK>,
                                 <&gcc GCC_QSPI_CORE_CLK>;
                        clock-names = "iface", "core";
-                       interconnects = <&gem_noc MASTER_APPSS_PROC
-                                       &config_noc SLAVE_QSPI_0>;
+                       interconnects = <&gem_noc MASTER_APPSS_PROC 0
+                                       &config_noc SLAVE_QSPI_0 0>;
                        interconnect-names = "qspi-config";
                        power-domains = <&rpmhpd SC7180_CX>;
                        operating-points-v2 = <&qspi_opp_table>;
@@ -2641,7 +2641,7 @@
                dc_noc: interconnect@9160000 {
                        compatible = "qcom,sc7180-dc-noc";
                        reg = <0 0x09160000 0 0x03200>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
@@ -2655,14 +2655,14 @@
                gem_noc: interconnect@9680000 {
                        compatible = "qcom,sc7180-gem-noc";
                        reg = <0 0x09680000 0 0x3e200>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
                npu_noc: interconnect@9990000 {
                        compatible = "qcom,sc7180-npu-noc";
                        reg = <0 0x09990000 0 0x1600>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
@@ -2698,8 +2698,8 @@
 
                        resets = <&gcc GCC_USB30_PRIM_BCR>;
 
-                       interconnects = <&aggre2_noc MASTER_USB3 &mc_virt SLAVE_EBI1>,
-                                       <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_USB3>;
+                       interconnects = <&aggre2_noc MASTER_USB3 0 &mc_virt SLAVE_EBI1 0>,
+                                       <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3 0>;
                        interconnect-names = "usb-ddr", "apps-usb";
 
                        usb_1_dwc3: dwc3@a600000 {
@@ -2733,8 +2733,8 @@
                                      "vcodec0_core", "vcodec0_bus";
                        iommus = <&apps_smmu 0x0c00 0x60>;
                        memory-region = <&venus_mem>;
-                       interconnects = <&mmss_noc MASTER_VIDEO_P0 &mc_virt SLAVE_EBI1>,
-                                       <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_VENUS_CFG>;
+                       interconnects = <&mmss_noc MASTER_VIDEO_P0 0 &mc_virt SLAVE_EBI1 0>,
+                                       <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_VENUS_CFG 0>;
                        interconnect-names = "video-mem", "cpu-cfg";
 
                        video-decoder {
@@ -2788,7 +2788,7 @@
                camnoc_virt: interconnect@ac00000 {
                        compatible = "qcom,sc7180-camnoc-virt";
                        reg = <0 0x0ac00000 0 0x1000>;
-                       #interconnect-cells = <1>;
+                       #interconnect-cells = <2>;
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };