Commit 60ed39db authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-v5.13-rc7' of... 

Merge tag 'usb-v5.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-linus

Peter writes:

One bug fix for USB charger detection at imx7d and imx8m series SoCs

* tag 'usb-v5.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb:
  usb: chipidea: imx: Fix Battery Charger 1.2 CDP detection
parents 4bf584a0 c6d580d9

drivers/usb/chipidea/usbmisc_imx.c

+14 −2
Original line number Diff line number Diff line
@@ -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);