arm64: dts: qcom: x1e80100: Set CPU interconnect paths as ACTIVE_ONLY

There is no use wasting power on keeping the links between the CPU and
something else online when the CPUs are online. Change the interconnect
tag for such paths, so that RPMh is requested to automatically
clock-gate those when possible.

Keeping these paths online is also a potential power collapse blocker,
however this commit alone doesn't magically fix all the remaining
TODOs related to suspend.

Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250111-topic-x1e_fixups-v1-2-77dc39237c12@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
index 4936fa5b98ff7a9a009e3106f4dba90131251971..9d38436763432892ceef95daf0335d4cf446357c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi
@@ -863,8 +863,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -899,8 +899,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -935,8 +935,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -971,8 +971,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1007,8 +1007,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1043,8 +1043,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1079,8 +1079,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1115,8 +1115,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1151,8 +1151,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1187,8 +1187,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1223,8 +1223,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1259,8 +1259,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1295,8 +1295,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>;
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>;
                                interconnect-names = "qup-core",
                                                     "qup-config";
 
@@ -1320,8 +1320,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1356,8 +1356,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1392,8 +1392,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1428,8 +1428,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_2 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_2 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_2 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1508,8 +1508,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1544,8 +1544,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1580,8 +1580,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1616,8 +1616,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1652,8 +1652,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1688,8 +1688,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1724,8 +1724,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1760,8 +1760,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1796,8 +1796,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1832,8 +1832,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1868,8 +1868,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1904,8 +1904,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1940,8 +1940,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -1976,8 +1976,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2012,8 +2012,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>;
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>;
                                interconnect-names = "qup-core",
                                                     "qup-config";
 
@@ -2037,8 +2037,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2073,8 +2073,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_1 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_1 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre1_noc MASTER_QUP_1 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2152,8 +2152,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2188,8 +2188,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2224,8 +2224,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2260,8 +2260,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2296,8 +2296,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2332,8 +2332,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>;
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>;
                                interconnect-names = "qup-core",
                                                     "qup-config";
 
@@ -2357,8 +2357,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2393,8 +2393,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2429,8 +2429,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2465,8 +2465,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2501,8 +2501,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2537,8 +2537,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2573,8 +2573,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2609,8 +2609,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2645,8 +2645,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2681,8 +2681,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -2717,8 +2717,8 @@
 
                                interconnects = <&clk_virt MASTER_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS
                                                 &clk_virt SLAVE_QUP_CORE_0 QCOM_ICC_TAG_ALWAYS>,
-                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ALWAYS>,
+                                               <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                                &config_noc SLAVE_QUP_0 QCOM_ICC_TAG_ACTIVE_ONLY>,
                                                <&aggre2_noc MASTER_QUP_0 QCOM_ICC_TAG_ALWAYS
                                                 &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>;
                                interconnect-names = "qup-core",
@@ -3194,8 +3194,8 @@
 
                        interconnects = <&pcie_north_anoc MASTER_PCIE_3 QCOM_ICC_TAG_ALWAYS
                                         &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
-                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                        &cnoc_main SLAVE_PCIE_3 QCOM_ICC_TAG_ALWAYS>;
+                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                        &cnoc_main SLAVE_PCIE_3 QCOM_ICC_TAG_ACTIVE_ONLY>;
                        interconnect-names = "pcie-mem",
                                             "cpu-pcie";
 
@@ -3395,8 +3395,8 @@
 
                        interconnects = <&pcie_south_anoc MASTER_PCIE_6A QCOM_ICC_TAG_ALWAYS
                                         &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
-                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                        &cnoc_main SLAVE_PCIE_6A QCOM_ICC_TAG_ALWAYS>;
+                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                        &cnoc_main SLAVE_PCIE_6A QCOM_ICC_TAG_ACTIVE_ONLY>;
                        interconnect-names = "pcie-mem",
                                             "cpu-pcie";
 
@@ -3522,8 +3522,8 @@
 
                        interconnects = <&pcie_north_anoc MASTER_PCIE_5 QCOM_ICC_TAG_ALWAYS
                                         &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
-                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                        &cnoc_main SLAVE_PCIE_5 QCOM_ICC_TAG_ALWAYS>;
+                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                        &cnoc_main SLAVE_PCIE_5 QCOM_ICC_TAG_ACTIVE_ONLY>;
                        interconnect-names = "pcie-mem",
                                             "cpu-pcie";
 
@@ -3646,8 +3646,8 @@
 
                        interconnects = <&pcie_north_anoc MASTER_PCIE_4 QCOM_ICC_TAG_ALWAYS
                                         &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
-                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                        &cnoc_main SLAVE_PCIE_4 QCOM_ICC_TAG_ALWAYS>;
+                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                        &cnoc_main SLAVE_PCIE_4 QCOM_ICC_TAG_ACTIVE_ONLY>;
                        interconnect-names = "pcie-mem",
                                             "cpu-pcie";
 
@@ -4694,8 +4694,8 @@
 
                        interconnects = <&usb_south_anoc MASTER_USB3_2 QCOM_ICC_TAG_ALWAYS
                                         &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
-                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                        &config_noc SLAVE_USB3_2 QCOM_ICC_TAG_ALWAYS>;
+                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                        &config_noc SLAVE_USB3_2 QCOM_ICC_TAG_ACTIVE_ONLY>;
                        interconnect-names = "usb-ddr",
                                             "apps-usb";
 
@@ -4794,8 +4794,8 @@
 
                        interconnects = <&usb_north_anoc MASTER_USB2 QCOM_ICC_TAG_ALWAYS
                                         &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
-                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                        &config_noc SLAVE_USB2 QCOM_ICC_TAG_ALWAYS>;
+                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                        &config_noc SLAVE_USB2 QCOM_ICC_TAG_ACTIVE_ONLY>;
                        interconnect-names = "usb-ddr",
                                             "apps-usb";
 
@@ -4879,8 +4879,8 @@
 
                        interconnects = <&usb_north_anoc MASTER_USB3_MP QCOM_ICC_TAG_ALWAYS
                                         &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
-                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                        &config_noc SLAVE_USB3_MP QCOM_ICC_TAG_ALWAYS>;
+                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                        &config_noc SLAVE_USB3_MP QCOM_ICC_TAG_ACTIVE_ONLY>;
                        interconnect-names = "usb-ddr",
                                             "apps-usb";
 
@@ -5053,8 +5053,8 @@
 
                        interconnects = <&usb_south_anoc MASTER_USB3_1 QCOM_ICC_TAG_ALWAYS
                                         &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>,
-                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ALWAYS
-                                        &config_noc SLAVE_USB3_1 QCOM_ICC_TAG_ALWAYS>;
+                                       <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                        &config_noc SLAVE_USB3_1 QCOM_ICC_TAG_ACTIVE_ONLY>;
                        interconnect-names = "usb-ddr",
                                             "apps-usb";