diff --git a/qcom/lahaina-qrd-module.dtsi b/qcom/lahaina-qrd-module.dtsi
index e69c9b3b3c8d..454c4defac70 100644
--- a/qcom/lahaina-qrd-module.dtsi
+++ b/qcom/lahaina-qrd-module.dtsi
@@ -20,7 +20,7 @@
 };
 
 &usb_qmp_dp_phy {
-	pinctrl-names = "portselect";
+	pinctrl-names = "unused";
 };
 
 &usb0 {
@@ -30,13 +30,15 @@
 &qupv3_se13_i2c {
 	status = "ok";
 
+	#address-cells = <1>;
+	#size-cells = <0>;
 	redriver: redriver@1c {
 		compatible = "onnn,redriver";
 		reg = <0x1c>;
 
-		pinctrl-names = "enable_gpio";
+		pinctrl-names = "default";
 		pinctrl-0 = <&usb3phy_portselect_gpio>;
-		orientation_gpio = <&tlmm 81 0>;
+		gpios = <&tlmm 81 0>;
 
 		eq = /bits/ 8 <
 				/* Parameters for USB */
diff --git a/qcom/lahaina-qrd.dtsi b/qcom/lahaina-qrd.dtsi
index d169151f2a0f..6f951aa71eb1 100644
--- a/qcom/lahaina-qrd.dtsi
+++ b/qcom/lahaina-qrd.dtsi
@@ -20,7 +20,7 @@
 };
 
 &usb_qmp_dp_phy {
-	pinctrl-names = "portselect";
+	pinctrl-names = "unused";
 };
 
 &usb0 {
@@ -30,13 +30,15 @@
 &qupv3_se13_i2c {
 	status = "ok";
 
+	#address-cells = <1>;
+	#size-cells = <0>;
 	redriver: redriver@1c {
 		compatible = "onnn,redriver";
 		reg = <0x1c>;
 
-		pinctrl-names = "enable_gpio";
+		pinctrl-names = "default";
 		pinctrl-0 = <&usb3phy_portselect_gpio>;
-		orientation_gpio = <&tlmm 81 0>;
+		gpios = <&tlmm 81 0>;
 
 		eq = /bits/ 8 <
 				/* Parameters for USB */
diff --git a/qcom/shima-qrd.dtsi b/qcom/shima-qrd.dtsi
index 89af7cd016bc..926f4c272a16 100644
--- a/qcom/shima-qrd.dtsi
+++ b/qcom/shima-qrd.dtsi
@@ -481,19 +481,21 @@
 };
 
 &usb_qmp_dp_phy {
-	pinctrl-names = "portselect";
+	pinctrl-names = "unused";
 };
 
 &qupv3_se5_i2c {
 	status = "ok";
 
+	#address-cells = <1>;
+	#size-cells = <0>;
 	redriver: redriver@1c {
 		compatible = "onnn,redriver";
 		reg = <0x1c>;
 
-		pinctrl-names = "enable_gpio";
+		pinctrl-names = "default";
 		pinctrl-0 = <&usb3phy_portselect_gpio>;
-		orientation_gpio = <&tlmm 81 0>;
+		gpios = <&tlmm 81 0>;
 
 		eq = /bits/ 8 <
 				/* Parameters for USB */