diff --git a/qcom/blair-cypfr-common-overlay.dtsi b/qcom/blair-cypfr-common-overlay.dtsi
index 275aa8c43731..6daaeffc0fc9 100644
--- a/qcom/blair-cypfr-common-overlay.dtsi
+++ b/qcom/blair-cypfr-common-overlay.dtsi
@@ -26,10 +26,8 @@
 #include "discrete_charging.dtsi"
 #include "sgm7220.dtsi"
 #include "blair-cypfr-fmr-overlay.dtsi"
+#include <dt-bindings/iio/qti_power_supply_iio.h>
 
-&usb0 {
-       qcom,force-adb-enable;
-};
 
 &wcd937x_codec {
 	cdc-vdd-rxtx-supply = <&L9A>;
@@ -552,6 +550,11 @@
 &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";
 	};
 };