diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi
index 77aac43d..0bb558d0 100644
--- a/qcom/sun.dtsi
+++ b/qcom/sun.dtsi
@@ -805,25 +805,33 @@
 		clock-frequency = <19200000>;
 	};
 
+	pcie_crm_hw_0_bcm_voter: bcm_voter@0 {
+		compatible = "qcom,bcm-voter";
+		qcom,crm-name = "pcie_crm";
+		qcom,crm-client-idx = <0>;
+		qcom,crm-pwr-states = <5>;
+	};
+
 	clk_virt: interconnect@0 {
 		compatible = "qcom,sun-clk_virt";
 		#interconnect-cells = <1>;
-		qcom,bcm-voter-names = "hlos";
-		qcom,bcm-voters = <&apps_bcm_voter>;
-		qcom,disabled-voters = "pcie_crm_hw_0", "pcie_crm_hw_1";
+		qcom,bcm-voter-names = "hlos",
+				       "pcie_crm_hw_0";
+		qcom,bcm-voters = <&apps_bcm_voter>,
+				  <&pcie_crm_hw_0_bcm_voter>;
 	};
 
 	mc_virt: interconnect@1 {
 		compatible = "qcom,sun-mc_virt";
 		#interconnect-cells = <1>;
-		qcom,bcm-voter-names = "hlos";
-		qcom,bcm-voters = <&apps_bcm_voter>;
+		qcom,bcm-voter-names = "hlos",
+				       "pcie_crm_hw_0";
+		qcom,bcm-voters = <&apps_bcm_voter>,
+				  <&pcie_crm_hw_0_bcm_voter>;
 		qcom,disabled-voters = "disp",
 				       "cam_ife_0",
 				       "cam_ife_1",
-				       "cam_ife_2",
-				       "pcie_crm_hw_0",
-				       "pcie_crm_hw_1";
+				       "cam_ife_2";
 	};
 
 	config_noc: interconnect@1600000 {
@@ -856,9 +864,10 @@
 		#interconnect-cells = <1>;
 		clocks = <&gcc GCC_AGGRE_NOC_PCIE_AXI_CLK>,
 			 <&gcc GCC_CFG_NOC_PCIE_ANOC_AHB_CLK>;
-		qcom,bcm-voter-names = "hlos";
-		qcom,bcm-voters = <&apps_bcm_voter>;
-		qcom,disabled-voters = "pcie_crm_hw_0", "pcie_crm_hw_1";
+		qcom,bcm-voter-names = "hlos",
+				       "pcie_crm_hw_0";
+		qcom,bcm-voters = <&apps_bcm_voter>,
+				  <&pcie_crm_hw_0_bcm_voter>;
 		qcom,skip-qos;
 	};
 
@@ -897,14 +906,14 @@
 		compatible = "qcom,sun-gem_noc";
 		reg = <0x24100000 0x14b080>;
 		#interconnect-cells = <1>;
-		qcom,bcm-voter-names = "hlos";
-		qcom,bcm-voters = <&apps_bcm_voter>;
+		qcom,bcm-voter-names = "hlos",
+				       "pcie_crm_hw_0";
+		qcom,bcm-voters = <&apps_bcm_voter>,
+				  <&pcie_crm_hw_0_bcm_voter>;
 		qcom,disabled-voters = "disp",
 				       "cam_ife_0",
 				       "cam_ife_1",
-				       "cam_ife_2",
-				       "pcie_crm_hw_0",
-				       "pcie_crm_hw_1";
+				       "cam_ife_2";
 		qcom,skip-qos;
 	};