mx8mm: usb: chipidea: Fix Battery Charger 1.2 CDP detection
PATCH v2 1/1 mx8mm: usb: chipidea: Fix Battery Charger 1.2 CDP detection
i.MX8MM cannot detect certain CDP USB HUBs. usbmisc_imx.c driver is not following CDP timing requirements defined by USB BC 1.2 specification and section 3.2.4 Detection Timing CDP.
During Primary Detection the i.MX device should turn on VDP_SRC and IDM_SINK for a minimum of 40ms (TVDPSRC_ON). After a time of TVDPSRC_ON, the PD is allowed to check the status of the D- line. Current implementation is waiting between 1ms and 2ms, and certain BC 1.2 complaint USB HUBs cannot be detected. Increase delay to 40ms allowing enough time for primary detection.
During secondary detection the PD is required to disable VDP_SRC and IDM_SNK, and enable VDM_SRC and IDP_SINK for at least 40ms (TVDMSRC_ON).
Current implementation is not disabling VDP_SRC and IDM_SNK, introduce disable sequence in imx7d_charger_secondary_detection() function.
VDM_SRC and IDP_SINK should be enabled for at least 40ms (TVDMSRC_ON). Increase delay allowing enough time for detection.
---
Changes since V1:
- Updated commit log to include commit ID fix
drivers/usb/chipidea/usbmisc_imx.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/usb/chipidea/usbmisc_imx.c +14 -2
@@ -686,6 +686,16 @@ static int imx7d_charger_secondary_detection(struct imx_usbmisc_data *data)int val;unsigned long flags; +/* Clear VDATSRCENB0 to disable VDP_SRC and IDM_SNK required by BC 1.2 spec */ +spin_lock_irqsave (&usbmisc->lock, flags); + val =readl (usbmisc->base +MX7D_USB_OTG_PHY_CFG2 ); + val &= ~MX7D_USB_OTG_PHY_CFG2_CHRG_VDATSRCENB0 ; +writel (val, usbmisc->base +MX7D_USB_OTG_PHY_CFG2 ); +spin_unlock_irqrestore (&usbmisc->lock, flags); + +/* TVDMSRC_DIS */ +msleep (20 ); +/* VDM_SRC is connected to D- and IDP_SINK is connected to D+ */ spin_lock_irqsave (&usbmisc->lock, flags); val =readl (usbmisc->base +MX7D_USB_OTG_PHY_CFG2 );
@@ -695,7 +705,8 @@ static int imx7d_charger_secondary_detection(struct imx_usbmisc_data *data) usbmisc->base + MX7D_USB_OTG_PHY_CFG2);spin_unlock_irqrestore (&usbmisc->lock, flags); -usleep_range (1000 ,2000 ); +/* TVDMSRC_ON */ +msleep (40 );/* * Per BC 1.2, check voltage of D+:
@@ -798,7 +809,8 @@ static int imx7d_charger_primary_detection(struct imx_usbmisc_data *data) usbmisc->base + MX7D_USB_OTG_PHY_CFG2);spin_unlock_irqrestore (&usbmisc->lock, flags); -usleep_range (1000 ,2000 ); +/* TVDPSRC_ON */ +msleep (40 );/* Check if D- is less than VDAT_REF to determine an SDP per BC 1.2 */ val =readl (usbmisc->base +MX7D_USB_OTG_PHY_STATUS );
Signature · 1 line
2.25.1
Peter Chen
maintainerQuoted 4 lines · Breno Lima
i.MX8MM cannot detect certain CDP USB HUBs.
usbmisc_imx.cdriver is not following CDP timing requirements defined by USB BC 1.2 specification and section 3.2.4 Detection Timing CDP.
Quoted 8 lines
During Primary Detection the i.MX device should turn on
VDP_SRCandIDM_SINKfor a minimum of 40ms (TVDPSRC_ON). After a time ofTVDPSRC_ON, the PD is allowed to check the status of the D- line. Current implementation is waiting between 1ms and 2ms, and certain BC 1.2 complaint USB HUBs cannot be detected. Increase delay to 40ms allowing enough time for primary detection.During secondary detection the PD is required to disable
VDP_SRCand
What does the "PD" mean here?
Quoted 9 lines
IDM_SNK, and enableVDM_SRCandIDP_SINKfor at least 40ms (TVDMSRC_ON).Current implementation is not disabling
VDP_SRCandIDM_SNK, introduce disable sequence inimx7d_charger_secondary_detection()function.
VDM_SRCandIDP_SINKshould be enabled for at least 40ms (TVDMSRC_ON). Increase delay allowing enough time for detection.Fixes 746f316b753a ("usb: chipidea: introduce imx7d USB charger detection")
I assume this one needs to go stable tree?
Peter
Quoted 53 lines
Signed-off-by Breno Lima <[email protected]>Signed-off-by Jun Li <[email protected]>---
Changes since V1:
- Updated commit log to include commit ID fixdrivers/usb/chipidea/usbmisc_imx.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)drivers/usb/chipidea/usbmisc_imx.c +14
-2@@ -686,6 +686,16 @@ static int imx7d_charger_secondary_detection(struct imx_usbmisc_data *data)int val;unsigned long flags; +/* Clear VDATSRCENB0 to disable VDP_SRC and IDM_SNK required by BC 1.2 spec */ +spin_lock_irqsave (&usbmisc->lock, flags); + val =readl (usbmisc->base +MX7D_USB_OTG_PHY_CFG2 ); + val &= ~MX7D_USB_OTG_PHY_CFG2_CHRG_VDATSRCENB0 ; +writel (val, usbmisc->base +MX7D_USB_OTG_PHY_CFG2 ); +spin_unlock_irqrestore (&usbmisc->lock, flags); + +/* TVDMSRC_DIS */ +msleep (20 ); +/* VDM_SRC is connected to D- and IDP_SINK is connected to D+ */ spin_lock_irqsave (&usbmisc->lock, flags); val =readl (usbmisc->base +MX7D_USB_OTG_PHY_CFG2 );@@ -695,7 +705,8 @@ static int imx7d_charger_secondary_detection(struct imx_usbmisc_data *data) usbmisc->base + MX7D_USB_OTG_PHY_CFG2);spin_unlock_irqrestore (&usbmisc->lock, flags); -usleep_range (1000 ,2000 ); +/* TVDMSRC_ON */ +msleep (40 );/* * Per BC 1.2, check voltage of D+: @@ -798,7 +809,8 @@ static int imx7d_charger_primary_detection(struct imx_usbmisc_data *data) usbmisc->base + MX7D_USB_OTG_PHY_CFG2);spin_unlock_irqrestore (&usbmisc->lock, flags); -usleep_range (1000 ,2000 ); +/* TVDPSRC_ON */ +msleep (40 );/* Check if D- is less than VDAT_REF to determine an SDP per BC 1.2 */ val =readl (usbmisc->base +MX7D_USB_OTG_PHY_STATUS );Signature · 1 line
2.25.1
Signature · 2 lines
Thanks, Peter Chen
Hi Peter,
Em sáb., 12 de jun. de 2021 às 03:24, Peter Chen
<[email protected]> escreveu:
Quoted 13 lines · Breno Lima
Quoted 11 lines
i.MX8MM cannot detect certain CDP USB HUBs.
usbmisc_imx.cdriver is not following CDP timing requirements defined by USB BC 1.2 specification and section 3.2.4 Detection Timing CDP.During Primary Detection the i.MX device should turn on
VDP_SRCandIDM_SINKfor a minimum of 40ms (TVDPSRC_ON). After a time ofTVDPSRC_ON, the PD is allowed to check the status of the D- line. Current implementation is waiting between 1ms and 2ms, and certain BC 1.2 complaint USB HUBs cannot be detected. Increase delay to 40ms allowing enough time for primary detection.
Quoted 4 lines
Quoted 1 line
During secondary detection the PD is required to disable
VDP_SRCandWhat does the "PD" mean here?
PD stands for Portable Device, I can send another version and mention i.MX instead.
Thanks for pointing this out.
Best regards,
Breno Lima