Skip to contentSkip to conversation

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

PATCH Applied Peter Chen 3 participants 7 messages Jul 24, 2020 – Aug 22, 2020

Subsystems (4)
lore
Share & tools
lore

Peter Chen

author
#0 lore raw

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

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

---
Changes for v3:
- Changing propery name to indicate it is a samsung phy
- Add property range and default value.

 Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | 9 +++++++++
 1 file changed, 9 insertions(+)
Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +9 -0
index 51376cbe5f3d..a5c5db6a0b2d 100644
@@ -100,6 +100,15 @@ 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
+- samsung,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.
+  The range is from 0x0 to 0x3, the default value is 0x1.
+  Details can refer to TXPREEMPAMPTUNE0 bits of USBNC_n_PHY_CFG1.
+- samsung,picophy-dc-vol-level-adjust: HS DC Voltage Level Adjustment.
+  Adjust the high-speed transmitter DC level voltage.
+  The range is from 0x0 to 0xf, the default value is 0x3.
+  Details can refer to TXVREFTUNE0 bits of USBNC_n_PHY_CFG1.
 
 Example:
 
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v3 2/4 usb: chipidea: imx: add two samsung 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.

---
Changes for v3:
- Using new property name

 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..3129df2c46fb 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, "samsung,picophy-pre-emp-curr-control",
+			&data->emp_curr_control);
+	of_property_read_u32(np, "samsung,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 v3 3/4 arm64: dts: imx8mm-evk: add two parameters for samsung picophy tuning

In reply to Peter Chen

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

---
Changes for v3:
- Using the new property name
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..7c652b898114 100644
@@ -324,6 +324,8 @@
 	srp-disable;
 	adp-disable;
 	usb-role-switch;
+	samsung,picophy-pre-emp-curr-control = <3>;
+	samsung,picophy-dc-vol-level-adjust = <7>;
 	status = "okay";
 
 	port {
Signature · 1 line
2.17.1
author
#3 lore raw

Re: [PATCH v3 3/4] arm64: dts: imx8mm-evk: add two parameters for samsung picophy tuning

Quoted 19 lines · Peter Chen

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

---
Changes for v3:
- Using the new property name
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 +0 -0
index 0f1d7f8aeac4..7c652b898114 100644

arch/arm64/boot/dts/freescale/imx8mm-evk.dts line 331

Quoted 8 lines
arch/arm64/boot/dts/freescale/imx8mm-evk.dts +2 -0
@@ -324,6 +324,8 @@
 	srp-disable;
 	adp-disable;
 	usb-role-switch;
+	samsung,picophy-pre-emp-curr-control = <3>;
+	samsung,picophy-dc-vol-level-adjust = <7>;
 	status = "okay";
 
 	port {

Hi Shawn,

Rob has already acked the binding-doc changes, would you please queue these two dts changes?

Signature · 2 lines
Thanks,
Peter Chen
Applied
#4 lore raw

Re: [PATCH v3 3/4] arm64: dts: imx8mm-evk: add two parameters for samsung picophy tuning

Quoted 26 lines · Peter Chen
Quoted 25 lines · Peter Chen

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

---
Changes for v3:
- Using the new property name
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..7c652b898114 100644
@@ -324,6 +324,8 @@
 	srp-disable;
 	adp-disable;
 	usb-role-switch;
+	samsung,picophy-pre-emp-curr-control = <3>;
+	samsung,picophy-dc-vol-level-adjust = <7>;
 	status = "okay";
 
Quoted 7 lines

arch/arm64/boot/dts/freescale/imx8mm-evk.dts line 331

Quoted 2 lines
arch/arm64/boot/dts/freescale/imx8mm-evk.dts +0 -0
 	port {

Hi Shawn,

Rob has already acked the binding-doc changes, would you please queue these two dts changes?

Applied patch #3 and #4, thanks.

author
#5 lore raw

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

In reply to Peter Chen

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

---
Changes for v3:
- Using the new property name
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..7453aec0a5fc 100644
@@ -132,6 +132,8 @@
 	srp-disable;
 	adp-disable;
 	usb-role-switch;
+	samsung,picophy-pre-emp-curr-control = <3>;
+	samsung,picophy-dc-vol-level-adjust = <7>;
 	status = "okay";
 
 	port {
Signature · 1 line
2.17.1
maintainer Reviewed-by on v3 1/4
#6 lore raw
In reply to Peter Chen
Quoted 5 lines · Peter Chen

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

Quoted 8 lines

---
Changes for v3:
- Changing propery name to indicate it is a samsung phy
- Add property range and default value.

 Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | 9 +++++++++
 1 file changed, 9 insertions(+)