Commit e2c8f8e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-5.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here are three small USB fixes for reported problems for 5.13-rc7.
  They include:

   - disable autosuspend for a cypress USB hub

   - fix the battery charger detection for the chipidea driver

   - fix a kernel panic in the dwc3 driver due to a previous change in
     5.13-rc1.

  All have been in linux-next with no reported problems"

* tag 'usb-5.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: core: hub: Disable autosuspend for Cypress CY7C65632
  usb: chipidea: imx: Fix Battery Charger 1.2 CDP detection
  usb: dwc3: core: fix kernel panic when do reboot
parents c3bf96ea a7d8d1c7

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);

drivers/usb/core/hub.c

+7 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 
#define USB_VENDOR_GENESYS_LOGIC		0x05e3

#define USB_VENDOR_SMSC				0x0424

#define USB_PRODUCT_USB5534B			0x5534

#define USB_VENDOR_CYPRESS			0x04b4

#define USB_PRODUCT_CY7C65632			0x6570

#define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND	0x01

#define HUB_QUIRK_DISABLE_AUTOSUSPEND		0x02
@@ -5697,6 +5699,11 @@ static const struct usb_device_id hub_id_table[] = { 
      .idProduct = USB_PRODUCT_USB5534B,

      .bInterfaceClass = USB_CLASS_HUB,

      .driver_info = HUB_QUIRK_DISABLE_AUTOSUSPEND},

    { .match_flags = USB_DEVICE_ID_MATCH_VENDOR

                   | USB_DEVICE_ID_MATCH_PRODUCT,

      .idVendor = USB_VENDOR_CYPRESS,

      .idProduct = USB_PRODUCT_CY7C65632,

      .driver_info = HUB_QUIRK_DISABLE_AUTOSUSPEND},

    { .match_flags = USB_DEVICE_ID_MATCH_VENDOR

			| USB_DEVICE_ID_MATCH_INT_CLASS,

      .idVendor = USB_VENDOR_GENESYS_LOGIC,

drivers/usb/dwc3/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1671,8 +1671,8 @@ static int dwc3_remove(struct platform_device *pdev) 


	pm_runtime_get_sync(&pdev->dev);



	dwc3_debugfs_exit(dwc);

	dwc3_core_exit_mode(dwc);

	dwc3_debugfs_exit(dwc);



	dwc3_core_exit(dwc);

	dwc3_ulpi_exit(dwc);