diff --git a/qcom/blair-nopmi-milanf-common-overlay.dtsi b/qcom/blair-nopmi-milanf-common-overlay.dtsi
index edd28552926f..aa110e29bc6a 100644
--- a/qcom/blair-nopmi-milanf-common-overlay.dtsi
+++ b/qcom/blair-nopmi-milanf-common-overlay.dtsi
@@ -12,6 +12,7 @@
 #include "blair-milanf-common-overlay.dtsi"
 #include "blair-nopmi-moto-common-overlay.dtsi"
 #include "tcpc_config.dtsi"
+#include "discrete-rt-pd-manger.dtsi"
 #include "sgm7220.dtsi"
 #include "rt9426a.dtsi"
 #include "discrete_charging.dtsi"
diff --git a/qcom/discrete-rt-pd-manger.dtsi b/qcom/discrete-rt-pd-manger.dtsi
new file mode 100644
index 000000000000..8020a03c1376
--- /dev/null
+++ b/qcom/discrete-rt-pd-manger.dtsi
@@ -0,0 +1,26 @@
+/* Copyright (c) 2021, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+
+&soc {
+	rpm: rt-pd-manager {
+		compatible = "richtek,rt-pd-manager";
+		#io-channel-cells = <1>;
+		io-channels = <&mmi_discrete_charger PSY_IIO_USB_REAL_TYPE>,
+			      <&mmi_discrete_charger PSY_IIO_MMI_OTG_ENABLE>,
+			      <&mmi_discrete_charger PSY_IIO_TYPEC_MODE>;
+		io-channel-names = "usb_real_type",
+				   "otg_enable",
+				   "typec_mode";
+
+	};
+};
diff --git a/qcom/tcpc_config.dtsi b/qcom/tcpc_config.dtsi
index 9e7efe6a577d..19b160cd6cd4 100644
--- a/qcom/tcpc_config.dtsi
+++ b/qcom/tcpc_config.dtsi
@@ -162,18 +162,6 @@
 	};
 };
 
-&soc {
-	rpm: rt-pd-manager {
-		compatible = "richtek,rt-pd-manager";
-		#io-channel-cells = <1>;
-		io-channels = <&mmi_discrete_charger PSY_IIO_USB_REAL_TYPE>,
-			      <&mmi_discrete_charger PSY_IIO_MMI_OTG_ENABLE>;
-		io-channel-names = "usb_real_type",
-				   "otg_enable";
-
-	};
-};
-
 &tlmm {
 	rt1711h_int_n: rt1711h_int_n {
 		mux {