Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62718e30 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are a few USB fixes for 4.5-rc6

  They fix a reported bug for some USB 3 devices by reverting the recent
  patch, a MAINTAINERS change for some drivers, some new device ids, and
  of course, the usual bunch of USB gadget driver fixes.

  All have been in linux-next for a while with no reported issues"

* tag 'usb-4.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  MAINTAINERS: drop OMAP USB and MUSB maintainership
  usb: musb: fix DMA for host mode
  usb: phy: msm: Trigger USB state detection work in DRD mode
  usb: gadget: net2280: fix endpoint max packet for super speed connections
  usb: gadget: gadgetfs: unregister gadget only if it got successfully registered
  usb: gadget: remove driver from pending list on probe error
  Revert "usb: hub: do not clear BOS field during reset device"
  usb: chipidea: fix return value check in ci_hdrc_pci_probe()
  usb: chipidea: error on overflow for port_test_write
  USB: option: add "4G LTE usb-modem U901"
  USB: cp210x: add IDs for GE B650V3 and B850V3 boards
  USB: option: add support for SIM7100E
  usb: musb: Fix DMA desired mode for Mentor DMA engine
  usb: gadget: fsl_qe_udc: fix IS_ERR_VALUE usage
  usb: dwc2: USB_DWC2 should depend on HAS_DMA
  usb: dwc2: host: fix the data toggle error in full speed descriptor dma
  usb: dwc2: host: fix logical omissions in dwc2_process_non_isoc_desc
  usb: dwc3: Fix assignment of EP transfer resources
  usb: dwc2: Add extra delay when forcing dr_mode
parents 12b9fa6a 428b315a

MAINTAINERS

+2 −5
Original line number Original line Diff line number Diff line
@@ -3451,7 +3451,6 @@ F: drivers/usb/dwc2/ 
DESIGNWARE USB3 DRD IP DRIVER

DESIGNWARE USB3 DRD IP DRIVER

M:	Felipe Balbi <balbi@kernel.org>

M:	Felipe Balbi <balbi@kernel.org>

L:	linux-usb@vger.kernel.org

L:	linux-usb@vger.kernel.org

L:	linux-omap@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git

S:	Maintained

S:	Maintained

F:	drivers/usb/dwc3/

F:	drivers/usb/dwc3/
@@ -7361,7 +7360,7 @@ F: drivers/tty/isicom.c 
F:	include/linux/isicom.h

F:	include/linux/isicom.h





MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER

MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER

M:	Felipe Balbi <balbi@kernel.org>

M:	Bin Liu <b-liu@ti.com>

L:	linux-usb@vger.kernel.org

L:	linux-usb@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git

S:	Maintained

S:	Maintained
@@ -7930,11 +7929,9 @@ F: drivers/media/platform/omap3isp/ 
F:	drivers/staging/media/omap4iss/

F:	drivers/staging/media/omap4iss/





OMAP USB SUPPORT

OMAP USB SUPPORT

M:	Felipe Balbi <balbi@kernel.org>

L:	linux-usb@vger.kernel.org

L:	linux-usb@vger.kernel.org

L:	linux-omap@vger.kernel.org

L:	linux-omap@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git

S:	Orphan

S:	Maintained

F:	drivers/usb/*/*omap*

F:	drivers/usb/*/*omap*

F:	arch/arm/*omap*/usb*

F:	arch/arm/*omap*/usb*

drivers/usb/chipidea/ci_hdrc_pci.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -85,8 +85,8 @@ static int ci_hdrc_pci_probe(struct pci_dev *pdev, 




	/* register a nop PHY */

	/* register a nop PHY */

	ci->phy = usb_phy_generic_register();

	ci->phy = usb_phy_generic_register();

	if (!ci->phy)

	if (IS_ERR(ci->phy))

		return -ENOMEM;

		return PTR_ERR(ci->phy);





	memset(res, 0, sizeof(res));

	memset(res, 0, sizeof(res));

	res[0].start	= pci_resource_start(pdev, 0);

	res[0].start	= pci_resource_start(pdev, 0);

drivers/usb/chipidea/debug.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -100,6 +100,9 @@ static ssize_t ci_port_test_write(struct file *file, const char __user *ubuf, 
	if (sscanf(buf, "%u", &mode) != 1)

	if (sscanf(buf, "%u", &mode) != 1)

		return -EINVAL;

		return -EINVAL;





	if (mode > 255)

		return -EBADRQC;



	pm_runtime_get_sync(ci->dev);

	pm_runtime_get_sync(ci->dev);

	spin_lock_irqsave(&ci->lock, flags);

	spin_lock_irqsave(&ci->lock, flags);

	ret = hw_port_test_set(ci, mode);

	ret = hw_port_test_set(ci, mode);

drivers/usb/core/hub.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -5401,6 +5401,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev) 
	}

	}





	bos = udev->bos;

	bos = udev->bos;

	udev->bos = NULL;





	for (i = 0; i < SET_CONFIG_TRIES; ++i) {

	for (i = 0; i < SET_CONFIG_TRIES; ++i) {
@@ -5493,11 +5494,8 @@ static int usb_reset_and_verify_device(struct usb_device *udev) 
	usb_set_usb2_hardware_lpm(udev, 1);

	usb_set_usb2_hardware_lpm(udev, 1);

	usb_unlocked_enable_lpm(udev);

	usb_unlocked_enable_lpm(udev);

	usb_enable_ltm(udev);

	usb_enable_ltm(udev);

	/* release the new BOS descriptor allocated  by hub_port_init() */

	if (udev->bos != bos) {

	usb_release_bos_descriptor(udev);

	usb_release_bos_descriptor(udev);

	udev->bos = bos;

	udev->bos = bos;

	}

	return 0;

	return 0;





re_enumerate:

re_enumerate:

drivers/usb/dwc2/Kconfig

+1 −0
Original line number Original line Diff line number Diff line 
config USB_DWC2

config USB_DWC2

	tristate "DesignWare USB2 DRD Core Support"

	tristate "DesignWare USB2 DRD Core Support"

	depends on HAS_DMA

	depends on USB || USB_GADGET

	depends on USB || USB_GADGET

	help

	help

	  Say Y here if your system has a Dual Role Hi-Speed USB

	  Say Y here if your system has a Dual Role Hi-Speed USB