Skip to contentSkip to conversation

doc: dt-binding: ci-hdrc-usb2: add property for imx picophy

PATCH Superseded Peter Chen 2 participants 5 messages Jul 17, 2020 – Jul 23, 2020

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Peter Chen

author
#0 lore raw

PATCH v2 1/4 doc: dt-binding: ci-hdrc-usb2: add property for imx picophy

Add two parameters which are used to tune USB signal for imx picophy, picophy is used at imx7d, imx8mm, and imx8mn.

---
No changes for v2.

 Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | 7 +++++++
 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +7 -0
index 51376cbe5f3d..e9858dafb08f 100644
@@ -100,6 +100,13 @@ i.mx specific properties
   It's recommended to specify the over current polarity.
 - power-active-high: power signal polarity is active high
 - external-vbus-divider: enables off-chip resistor divider for Vbus
+- picophy,pre-emp-curr-control: HS Transmitter Pre-Emphasis Current
+  Control. This signal controls the amount of current sourced to the
+  USB_OTG*_DP and USB_OTG*_DN pins after a J-to-K or K-to-J transition.
+  Details can refer to TXPREEMPAMPTUNE0 bits of USBNC_n_PHY_CFG1.
+- picophy,dc-vol-level-adjust: HS DC Voltage Level Adjustment.
+  Adjust the high-speed transmitter DC level voltage, details can refer
+  to TXVREFTUNE0 bits of USBNC_n_PHY_CFG1.
 
 Example:
 
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v2 2/4 usb: chipidea: imx: add two picophy parameters tuning implementation

These two parameters are used to improve USB signal for board level, in this commit, we read it from the dtb, and write to related register during the initialization.

---
No changes for v2.

 drivers/usb/chipidea/ci_hdrc_imx.c |  5 +++++
 drivers/usb/chipidea/ci_hdrc_imx.h |  2 ++
 drivers/usb/chipidea/usbmisc_imx.c | 21 +++++++++++++++++++++
 3 files changed, 28 insertions(+)
drivers/usb/chipidea/ci_hdrc_imx.c +5 -0
index 5ae16368a0c7..58de0f3ac0e9 100644
@@ -165,6 +165,11 @@ static struct imx_usbmisc_data *usbmisc_get_init_data(struct device *dev)
 	if (of_usb_get_phy_mode(np) == USBPHY_INTERFACE_MODE_ULPI)
 		data->ulpi = 1;
 
+	of_property_read_u32(np, "picophy,pre-emp-curr-control",
+			&data->emp_curr_control);
+	of_property_read_u32(np, "picophy,dc-vol-level-adjust",
+			&data->dc_vol_level_adjust);
+
 	return data;
 }
 
drivers/usb/chipidea/ci_hdrc_imx.h +2 -0
index 727d02b6dbd3..367bb0d0cb6b 100644
@@ -25,6 +25,8 @@ struct imx_usbmisc_data {
 	unsigned int ext_id:1; /* ID from exteranl event */
 	unsigned int ext_vbus:1; /* Vbus from exteranl event */
 	struct usb_phy *usb_phy;
+	int emp_curr_control;
+	int dc_vol_level_adjust;
 };
 
 int imx_usbmisc_init(struct imx_usbmisc_data *data);
drivers/usb/chipidea/usbmisc_imx.c +21 -0
index f136876cb4a3..f9881aed468f 100644
@@ -128,6 +128,12 @@
 #define MX7D_USB_OTG_PHY_STATUS_VBUS_VLD	BIT(3)
 #define MX7D_USB_OTG_PHY_STATUS_CHRGDET		BIT(29)
 
+#define MX7D_USB_OTG_PHY_CFG1		0x30
+#define TXPREEMPAMPTUNE0_BIT		28
+#define TXPREEMPAMPTUNE0_MASK		(3 << 28)
+#define TXVREFTUNE0_BIT			20
+#define TXVREFTUNE0_MASK		(0xf << 20)
+
 #define MX6_USB_OTG_WAKEUP_BITS (MX6_BM_WAKEUP_ENABLE | MX6_BM_VBUS_WAKEUP | \
 				 MX6_BM_ID_WAKEUP)
 
@@ -649,6 +655,21 @@ static int usbmisc_imx7d_init(struct imx_usbmisc_data *data)
 		writel(reg | MX7D_USB_VBUS_WAKEUP_SOURCE_BVALID
 			| MX7D_USBNC_AUTO_RESUME,
 			usbmisc->base + MX7D_USBNC_USB_CTRL2);
+		/* PHY tuning for signal quality */
+		reg = readl(usbmisc->base + MX7D_USB_OTG_PHY_CFG1);
+		if (data->emp_curr_control && data->emp_curr_control <=
+			(TXPREEMPAMPTUNE0_MASK >> TXPREEMPAMPTUNE0_BIT)) {
+			reg &= ~TXPREEMPAMPTUNE0_MASK;
+			reg |= (data->emp_curr_control << TXPREEMPAMPTUNE0_BIT);
+		}
+
+		if (data->dc_vol_level_adjust && data->dc_vol_level_adjust <=
+			(TXVREFTUNE0_MASK >> TXVREFTUNE0_BIT)) {
+			reg &= ~TXVREFTUNE0_MASK;
+			reg |= (data->dc_vol_level_adjust << TXVREFTUNE0_BIT);
+		}
+
+		writel(reg, usbmisc->base + MX7D_USB_OTG_PHY_CFG1);
 	}
 
 	spin_unlock_irqrestore(&usbmisc->lock, flags);
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH v2 3/4 arm64: dts: imx8mm-evk: add two parameters for picophy tuning

In reply to Peter Chen

With these two parameters tuning, it can pass USB eye diagram at evk board.

---
Changes for v2
- Address Shawn's comment to change subject.

 arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/freescale/imx8mm-evk.dts +2 -0
index 0f1d7f8aeac4..c432b628e1ed 100644
@@ -324,6 +324,8 @@
 	srp-disable;
 	adp-disable;
 	usb-role-switch;
+	picophy,pre-emp-curr-control = <3>;
+	picophy,dc-vol-level-adjust = <7>;
 	status = "okay";
 
 	port {
Signature · 1 line
2.17.1
author
#3 lore raw

PATCH v2 4/4 arm64: dts: imx8mn-evk: add two parameters for picophy tuning

In reply to Peter Chen

With these two parameters tuning, it can pass USB eye diagram at evk board.

---
Changes for v2
- Address Shawn's comment to change subject.

 arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi +2 -0
index 85fc0aa38c4f..a6e9035e6cd5 100644
@@ -132,6 +132,8 @@
 	srp-disable;
 	adp-disable;
 	usb-role-switch;
+	picophy,pre-emp-curr-control = <3>;
+	picophy,dc-vol-level-adjust = <7>;
 	status = "okay";
 
 	port {
Signature · 1 line
2.17.1
maintainer
#4 lore raw
In reply to Peter Chen
Quoted 16 lines · Peter Chen

Add two parameters which are used to tune USB signal for imx picophy, picophy is used at imx7d, imx8mm, and imx8mn.

---
No changes for v2.

 Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | 7 +++++++
 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +0 -0
index 51376cbe5f3d..e9858dafb08f 100644

Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt i.mx specific properties · line 103

Quoted 4 lines
Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +1 -0
@@ -100,6 +100,13 @@ i.mx specific properties
   It's recommended to specify the over current polarity.
 - power-active-high: power signal polarity is active high
 - external-vbus-divider: enables off-chip resistor divider for Vbus
+- picophy,pre-emp-curr-control: HS Transmitter Pre-Emphasis Current

Form is <vendor>,<prop-name> and picophy is not a vendor.

Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt i.mx specific properties · line 106

Quoted 3 lines
Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +3 -0
+  Control. This signal controls the amount of current sourced to the
+  USB_OTG*_DP and USB_OTG*_DN pins after a J-to-K or K-to-J transition.
+  Details can refer to TXPREEMPAMPTUNE0 bits of USBNC_n_PHY_CFG1.

What's the range of values? What's the default if not specified?

Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt i.mx specific properties · line 109

Quoted 3 lines
Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +3 -0
+- picophy,dc-vol-level-adjust: HS DC Voltage Level Adjustment.
+  Adjust the high-speed transmitter DC level voltage, details can refer
+  to TXVREFTUNE0 bits of USBNC_n_PHY_CFG1.

Same comments here.

Quoted 6 lines
Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +0 -0
 Example:
 
Signature · 1 line
2.17.1