From df251b8451be7168b12a051e45be7d18a91acc8d Mon Sep 17 00:00:00 2001
From: Linyu Yuan <linyyuan@qti.qualcomm.com>
Date: Fri, 24 Apr 2020 18:14:43 +0800
Subject: [PATCH 1/2] ARM: dts: msm: usb_phy pin support usb_phy and gpio mode

move usb_phy pinctrl from pcie group and add gpio mode.

Change-Id: I9e18629fbcc9784faeed7f5ec41c0cf2c6366e7b
---
 qcom/lahaina-pinctrl.dtsi | 42 +++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/qcom/lahaina-pinctrl.dtsi b/qcom/lahaina-pinctrl.dtsi
index 038c9f6be6cb..99959b52c75e 100644
--- a/qcom/lahaina-pinctrl.dtsi
+++ b/qcom/lahaina-pinctrl.dtsi
@@ -2926,19 +2926,6 @@
 				};
 			};
 		};
-
-		usb3phy_portselect_default: usb3phy_portselect_default {
-			mux {
-				pins = "gpio81";
-				function = "usb_phy";
-			};
-
-			config {
-				pins = "gpio81";
-				bias-disable;
-				drive-strength = <2>;
-			};
-		};
 	};
 
 	pmx_sde: pmx_sde {
@@ -3591,4 +3578,33 @@
 			};
 		};
 	};
+
+	usb_phy_ps: usb_phy_ps {
+		usb3phy_portselect_default: usb3phy_portselect_default {
+			mux {
+				pins = "gpio81";
+				function = "usb_phy";
+			};
+
+			config {
+				pins = "gpio81";
+				bias-disable;
+				drive-strength = <2>;
+			};
+		};
+
+		usb3phy_portselect_gpio: usb3phy_portselect_gpio {
+			mux {
+				pins = "gpio81";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio81";
+				drive-strength = <2>;
+				bias-pull-up;
+				input-enable;
+			};
+		};
+	};
 };

From f899045dbdbf20ccbed06c9dff034cb09818e304 Mon Sep 17 00:00:00 2001
From: Linyu Yuan <linyyuan@qti.qualcomm.com>
Date: Sat, 25 Apr 2020 15:30:43 +0800
Subject: [PATCH 2/2] ARM: dts: msm: enable superspeed plus redriver on QRD

add gpio pinctrl state and initial redriver related setting.

Change-Id: I50c6705abb8e043d9adb887968f06a6a39f83e83
---
 qcom/lahaina-qrd.dtsi | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/qcom/lahaina-qrd.dtsi b/qcom/lahaina-qrd.dtsi
index b82485af6e07..e16a96c4be19 100644
--- a/qcom/lahaina-qrd.dtsi
+++ b/qcom/lahaina-qrd.dtsi
@@ -188,3 +188,41 @@
 &wil6210 {
 	status = "ok";
 };
+
+&usb_qmp_dp_phy {
+	pinctrl-names = "portselect";
+};
+
+&qupv3_se13_i2c {
+	status = "ok";
+
+	redriver: redriver@1c {
+		compatible = "onnn,redriver";
+		reg = <0x1c>;
+
+		pinctrl-names = "enable_gpio";
+		pinctrl-0 = <&usb3phy_portselect_gpio>;
+		orientation_gpio = <&tlmm 81 0>;
+
+		eq = /bits/ 8 <
+				/* Parameters for USB */
+				0x4 0x4 0x4 0x4
+				/* Parameters for DP */
+				0x6 0x4 0x4 0x6>;
+		flat-gain = /bits/ 8 <
+				/* Parameters for USB */
+				0x3 0x1 0x1 0x3
+				/* Parameters for DP */
+				0x2 0x1 0x1 0x2>;
+		output-comp = /bits/ 8 <
+				/* Parameters for USB */
+				0x3 0x3 0x3 0x3
+				/* Parameters for DP */
+				0x3 0x3 0x3 0x3>;
+		loss-match = /bits/ 8 <
+				/* Parameters for USB */
+				0x1 0x3 0x3 0x1
+				/* Parameters for DP */
+				0x3 0x3 0x3 0x3>;
+	};
+};