diff --git a/qcom/tuna.dtsi b/qcom/tuna.dtsi
index f1ecb6ae..7fc8dc6d 100644
--- a/qcom/tuna.dtsi
+++ b/qcom/tuna.dtsi
@@ -2131,7 +2131,6 @@
 		#interconnect-cells = <1>;
 		qcom,bcm-voter-names = "hlos";
 		qcom,bcm-voters = <&apps_bcm_voter>;
-		qcom,skip-qos;
 	};
 
 	cnoc_main: interconnect@1500000 {
@@ -2140,7 +2139,6 @@
 		#interconnect-cells = <1>;
 		qcom,bcm-voter-names = "hlos";
 		qcom,bcm-voters = <&apps_bcm_voter>;
-		qcom,skip-qos;
 	};
 
 	system_noc: interconnect@1680000 {
@@ -2149,7 +2147,6 @@
 		#interconnect-cells = <1>;
 		qcom,bcm-voter-names = "hlos";
 		qcom,bcm-voters = <&apps_bcm_voter>;
-		qcom,skip-qos;
 	};
 
 	pcie_noc: interconnect@16c0000 {
@@ -2160,7 +2157,8 @@
 				       "pcie_crm_hw_0";
 		qcom,bcm-voters = <&apps_bcm_voter>,
 				  <&pcie_crm_hw_0_bcm_voter>;
-		qcom,skip-qos;
+		clocks = <&gcc GCC_AGGRE_NOC_PCIE_AXI_CLK>,
+			 <&gcc GCC_CFG_NOC_PCIE_ANOC_AHB_CLK>;
 	};
 
 	aggre1_noc: interconnect@16e0000 {
@@ -2169,7 +2167,6 @@
 		#interconnect-cells = <1>;
 		qcom,bcm-voter-names = "hlos";
 		qcom,bcm-voters = <&apps_bcm_voter>;
-		qcom,skip-qos;
 	};
 
 	aggre2_noc: interconnect@1700000 {
@@ -2178,7 +2175,7 @@
 		#interconnect-cells = <1>;
 		qcom,bcm-voter-names = "hlos";
 		qcom,bcm-voters = <&apps_bcm_voter>;
-		qcom,skip-qos;
+		clocks = <&rpmhcc RPMH_IPA_CLK>;
 	};
 
 	mmss_noc: interconnect@1780000 {
@@ -2207,7 +2204,6 @@
 				  <&disp_crm_hw_4_bcm_voter>,
 				  <&disp_crm_hw_5_bcm_voter>,
 				  <&disp_crm_sw_0_bcm_voter>;
-		qcom,skip-qos;
 	};
 
 	gem_noc: interconnect@24100000 {
@@ -2238,7 +2234,6 @@
 				  <&disp_crm_hw_4_bcm_voter>,
 				  <&disp_crm_hw_5_bcm_voter>,
 				  <&disp_crm_sw_0_bcm_voter>;
-		qcom,skip-qos;
 	};
 
 	nsp_noc: interconnect@320c0000 {
@@ -2247,7 +2242,6 @@
 		#interconnect-cells = <1>;
 		qcom,bcm-voter-names = "hlos";
 		qcom,bcm-voters = <&apps_bcm_voter>;
-		qcom,skip-qos;
 	};
 
 	lpass_ag_noc: interconnect@7e40000 {
@@ -2256,7 +2250,6 @@
 		#interconnect-cells = <1>;
 		qcom,bcm-voter-names = "hlos";
 		qcom,bcm-voters = <&apps_bcm_voter>;
-		qcom,skip-qos;
 	};
 
 	lpass_lpiaon_noc: interconnect@7400000 {
@@ -2265,7 +2258,6 @@
 		#interconnect-cells = <1>;
 		qcom,bcm-voter-names = "hlos";
 		qcom,bcm-voters = <&apps_bcm_voter>;
-		qcom,skip-qos;
 	};
 
 	lpass_lpicx_noc: interconnect@7420000 {
@@ -2274,7 +2266,6 @@
 		#interconnect-cells = <1>;
 		qcom,bcm-voter-names = "hlos";
 		qcom,bcm-voters = <&apps_bcm_voter>;
-		qcom,skip-qos;
 	};
 
 	qcom,rmtfs_sharedmem@0 {