diff --git a/qcom/neo-idp-mos.dtsi b/qcom/neo-idp-mos.dtsi
index f9e058d5..7e1d6265 100644
--- a/qcom/neo-idp-mos.dtsi
+++ b/qcom/neo-idp-mos.dtsi
@@ -1,5 +1,46 @@
 #include "neo-idp.dtsi"
+#include <dt-bindings/clock/qcom,gcc-neo.h>
+#include <dt-bindings/clock/qcom,tcsrcc.h>
 
 &soc {
 };
 
+&tcsrcc {
+	protected-clocks = <TCSR_PCIE_0_CLKREF_EN>,
+		<TCSR_PCIE_1_CLKREF_EN>;
+};
+
+&gcc {
+	clocks = <&rpmhcc RPMH_CXO_CLK>, <&sleep_clk>,
+		<&usb3_phy_wrapper_gcc_usb30_pipe_clk>;
+	clock-names = "bi_tcxo", "sleep_clk",
+		"usb3_phy_wrapper_gcc_usb30_pipe_clk";
+	protected-clocks =  <GCC_DDRSS_PCIE_SF_CLK>,
+		<GCC_PCIE_0_AUX_CLK>, <GCC_PCIE_0_AUX_CLK_SRC>,
+		<GCC_PCIE_0_CFG_AHB_CLK>, <GCC_PCIE_0_MSTR_AXI_CLK>,
+		<GCC_PCIE_0_PHY_RCHNG_CLK>, <GCC_PCIE_0_PHY_RCHNG_CLK_SRC>,
+		<GCC_PCIE_0_PIPE_CLK>, <GCC_PCIE_0_PIPE_CLK_SRC>,
+		<GCC_PCIE_0_SLV_AXI_CLK>, <GCC_PCIE_0_SLV_Q2A_AXI_CLK>,
+		<GCC_PCIE_1_AUX_CLK>, <GCC_PCIE_1_AUX_CLK_SRC>,
+		<GCC_PCIE_1_CFG_AHB_CLK>, <GCC_PCIE_1_MSTR_AXI_CLK>,
+		<GCC_PCIE_1_PHY_RCHNG_CLK>, <GCC_PCIE_1_PHY_RCHNG_CLK_SRC>,
+		<GCC_PCIE_1_PIPE_CLK>, <GCC_PCIE_1_PIPE_CLK_SRC>,
+		<GCC_PCIE_1_SLV_AXI_CLK>, <GCC_PCIE_1_SLV_Q2A_AXI_CLK>,
+		<GCC_QMIP_PCIE_AHB_CLK>;
+};
+
+&gcc_pcie_0_gdsc {
+	status = "disabled";
+};
+
+&gcc_pcie_0_phy_gdsc {
+	status = "disabled";
+};
+
+&gcc_pcie_1_gdsc {
+	status = "disabled";
+};
+
+&gcc_pcie_1_phy_gdsc {
+	status = "disabled";
+};
diff --git a/qcom/neo-qxr-mos.dtsi b/qcom/neo-qxr-mos.dtsi
index 60bd75f0..40b751d9 100644
--- a/qcom/neo-qxr-mos.dtsi
+++ b/qcom/neo-qxr-mos.dtsi
@@ -1,4 +1,46 @@
 #include "neo-qxr.dtsi"
+#include <dt-bindings/clock/qcom,gcc-neo.h>
+#include <dt-bindings/clock/qcom,tcsrcc.h>
 
 &soc {
 };
+
+&tcsrcc {
+	protected-clocks = <TCSR_PCIE_0_CLKREF_EN>,
+		<TCSR_PCIE_1_CLKREF_EN>;
+};
+
+&gcc {
+	clocks = <&rpmhcc RPMH_CXO_CLK>, <&sleep_clk>,
+		<&usb3_phy_wrapper_gcc_usb30_pipe_clk>;
+	clock-names = "bi_tcxo", "sleep_clk",
+		"usb3_phy_wrapper_gcc_usb30_pipe_clk";
+	protected-clocks =  <GCC_DDRSS_PCIE_SF_CLK>,
+		<GCC_PCIE_0_AUX_CLK>, <GCC_PCIE_0_AUX_CLK_SRC>,
+		<GCC_PCIE_0_CFG_AHB_CLK>, <GCC_PCIE_0_MSTR_AXI_CLK>,
+		<GCC_PCIE_0_PHY_RCHNG_CLK>, <GCC_PCIE_0_PHY_RCHNG_CLK_SRC>,
+		<GCC_PCIE_0_PIPE_CLK>, <GCC_PCIE_0_PIPE_CLK_SRC>,
+		<GCC_PCIE_0_SLV_AXI_CLK>, <GCC_PCIE_0_SLV_Q2A_AXI_CLK>,
+		<GCC_PCIE_1_AUX_CLK>, <GCC_PCIE_1_AUX_CLK_SRC>,
+		<GCC_PCIE_1_CFG_AHB_CLK>, <GCC_PCIE_1_MSTR_AXI_CLK>,
+		<GCC_PCIE_1_PHY_RCHNG_CLK>, <GCC_PCIE_1_PHY_RCHNG_CLK_SRC>,
+		<GCC_PCIE_1_PIPE_CLK>, <GCC_PCIE_1_PIPE_CLK_SRC>,
+		<GCC_PCIE_1_SLV_AXI_CLK>, <GCC_PCIE_1_SLV_Q2A_AXI_CLK>,
+		<GCC_QMIP_PCIE_AHB_CLK>;
+};
+
+&gcc_pcie_0_gdsc {
+	status = "disabled";
+};
+
+&gcc_pcie_0_phy_gdsc {
+	status = "disabled";
+};
+
+&gcc_pcie_1_gdsc {
+	status = "disabled";
+};
+
+&gcc_pcie_1_phy_gdsc {
+	status = "disabled";
+};
diff --git a/qcom/neo.dtsi b/qcom/neo.dtsi
index 78d33e7b..257f1957 100644
--- a/qcom/neo.dtsi
+++ b/qcom/neo.dtsi
@@ -728,21 +728,11 @@
 		vdd_cx-supply = <&VDD_CX_LEVEL>;
 		vdd_mxa-supply = <&VDD_MXA_LEVEL>;
 		clocks = <&rpmhcc RPMH_CXO_CLK>, <&sleep_clk>,
+			<&pcie_0_pipe_clk>, <&pcie_1_pipe_clk>,
 			<&usb3_phy_wrapper_gcc_usb30_pipe_clk>;
 		clock-names = "bi_tcxo", "sleep_clk",
+			"pcie_0_pipe_clk", "pcie_1_pipe_clk",
 			"usb3_phy_wrapper_gcc_usb30_pipe_clk";
-		protected-clocks =  <GCC_DDRSS_PCIE_SF_CLK>,
-				<GCC_PCIE_0_AUX_CLK>, <GCC_PCIE_0_AUX_CLK_SRC>,
-				<GCC_PCIE_0_CFG_AHB_CLK>, <GCC_PCIE_0_MSTR_AXI_CLK>,
-				<GCC_PCIE_0_PHY_RCHNG_CLK>, <GCC_PCIE_0_PHY_RCHNG_CLK_SRC>,
-				<GCC_PCIE_0_PIPE_CLK>, <GCC_PCIE_0_PIPE_CLK_SRC>,
-				<GCC_PCIE_0_SLV_AXI_CLK>, <GCC_PCIE_0_SLV_Q2A_AXI_CLK>,
-				<GCC_PCIE_1_AUX_CLK>, <GCC_PCIE_1_AUX_CLK_SRC>,
-				<GCC_PCIE_1_CFG_AHB_CLK>, <GCC_PCIE_1_MSTR_AXI_CLK>,
-				<GCC_PCIE_1_PHY_RCHNG_CLK>, <GCC_PCIE_1_PHY_RCHNG_CLK_SRC>,
-				<GCC_PCIE_1_PIPE_CLK>, <GCC_PCIE_1_PIPE_CLK_SRC>,
-				<GCC_PCIE_1_SLV_AXI_CLK>, <GCC_PCIE_1_SLV_Q2A_AXI_CLK>,
-				<GCC_QMIP_PCIE_AHB_CLK>;
 		#clock-cells = <1>;
 		#reset-cells = <1>;
 	};
@@ -831,8 +821,6 @@
 		compatible = "qcom,tcsrcc", "syscon";
 		reg = <0x1fc0000 0x30000>;
 		reg-name = "cc_base";
-		protected-clocks = <TCSR_PCIE_0_CLKREF_EN>,
-				<TCSR_PCIE_1_CLKREF_EN>;
 		#clock-cells = <1>;
 		#reset-cells = <1>;
 	};
@@ -2399,6 +2387,31 @@
 	status = "ok";
 };
 
+&gcc_pcie_0_gdsc {
+	parent-supply = <&VDD_CX_LEVEL>;
+	status = "ok";
+	/delete-property/ qcom,support-hw-trigger;
+	qcom,collapse-vote = <&gcc_apcs_gdsc_vote_ctrl &gcc_apcs_gdsc_sleep_ctrl 0>;
+};
+
+&gcc_pcie_0_phy_gdsc {
+	parent-supply = <&VDD_CX_LEVEL>;
+	status = "ok";
+	qcom,collapse-vote = <&gcc_apcs_gdsc_vote_ctrl &gcc_apcs_gdsc_sleep_ctrl 3>;
+};
+
+&gcc_pcie_1_gdsc {
+	parent-supply = <&VDD_CX_LEVEL>;
+	status = "ok";
+	qcom,collapse-vote = <&gcc_apcs_gdsc_vote_ctrl &gcc_apcs_gdsc_sleep_ctrl 1>;
+};
+
+&gcc_pcie_1_phy_gdsc {
+	parent-supply = <&VDD_CX_LEVEL>;
+	status = "ok";
+	qcom,collapse-vote = <&gcc_apcs_gdsc_vote_ctrl &gcc_apcs_gdsc_sleep_ctrl 4>;
+};
+
 &cam_cc_bps_gdsc {
 	clocks = <&gcc GCC_CAMERA_AHB_CLK>;
 	clock-names = "ahb_clk";
diff --git a/qcom/neo_la.dtsi b/qcom/neo_la.dtsi
index d11b8904..e022afa8 100644
--- a/qcom/neo_la.dtsi
+++ b/qcom/neo_la.dtsi
@@ -70,45 +70,6 @@
 	};
 };
 
-&tcsrcc {
-	/delete-property/ protected-clocks;
-};
-
-&gcc {
-	clocks = <&rpmhcc RPMH_CXO_CLK>, <&sleep_clk>,
-		<&pcie_0_pipe_clk>, <&pcie_1_pipe_clk>,
-		<&usb3_phy_wrapper_gcc_usb30_pipe_clk>;
-	clock-names = "bi_tcxo", "sleep_clk",
-		"pcie_0_pipe_clk", "pcie_1_pipe_clk",
-		"usb3_phy_wrapper_gcc_usb30_pipe_clk";
-	/delete-property/ protected-clocks;
-};
-
-&gcc_pcie_0_gdsc {
-	parent-supply = <&VDD_CX_LEVEL>;
-	status = "ok";
-	/delete-property/ qcom,support-hw-trigger;
-	qcom,collapse-vote = <&gcc_apcs_gdsc_vote_ctrl &gcc_apcs_gdsc_sleep_ctrl 0>;
-};
-
-&gcc_pcie_0_phy_gdsc {
-	parent-supply = <&VDD_CX_LEVEL>;
-	status = "ok";
-	qcom,collapse-vote = <&gcc_apcs_gdsc_vote_ctrl &gcc_apcs_gdsc_sleep_ctrl 3>;
-};
-
-&gcc_pcie_1_gdsc {
-	parent-supply = <&VDD_CX_LEVEL>;
-	status = "ok";
-	qcom,collapse-vote = <&gcc_apcs_gdsc_vote_ctrl &gcc_apcs_gdsc_sleep_ctrl 1>;
-};
-
-&gcc_pcie_1_phy_gdsc {
-	parent-supply = <&VDD_CX_LEVEL>;
-	status = "ok";
-	qcom,collapse-vote = <&gcc_apcs_gdsc_vote_ctrl &gcc_apcs_gdsc_sleep_ctrl 4>;
-};
-
 &wpss_pas {
 	status = "disabled";
 	/delete-property/ memory-region;