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

Commit 39c24270 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v3.11-rc1' of... 

Merge tag 'fixes-for-v3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb

 into usb-linus

Felipe writes:

usb: fixes for v3.11-rc1

Quite a few changes going on here. They have been
boot tested on OMAP5 and compile tested on ARM and x86
with different defconfigs.

Many gadget drivers got a depends on HAS_DMA in order
to prevent build failures on !HAS_DMA architectures.

DWC3 learned how to allow a gadget driver to be modprobed
after an unsuccessful modprobe of another gadget driver. It
also got a fix to a wrong bit mask in dwc3_event_type, and
learns to return proper error codes from failed usb3_phy
initialization.

RNDIS function driver can now be built with configfs.

at91_udc now knows that we need to prepare the clock
before enabling it.

renesas_usbhs now lets gadget drivers be modprobed
multiple times.

phy-omap-usb3 got a fix for the DPLL settings.

mv_u3d_core now passes the correct cookie to free_irq().

fotg210-udc got Section mismatch fixes.

Signed-of-by: default avatarFelipe Balbi <balbi@ti.com>
parents ad81f054 690c70ba

drivers/usb/dwc3/Kconfig

+1 −1
Original line number Diff line number Diff line 
config USB_DWC3

	tristate "DesignWare USB3 DRD Core Support"

	depends on (USB || USB_GADGET) && GENERIC_HARDIRQS

	depends on (USB || USB_GADGET) && GENERIC_HARDIRQS && HAS_DMA

	select USB_XHCI_PLATFORM if USB_SUPPORT && USB_XHCI_HCD

	help

	  Say Y or M here if your system has a Dual Role SuperSpeed

drivers/usb/dwc3/core.c

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ static int dwc3_probe(struct platform_device *pdev) 
	}



	if (IS_ERR(dwc->usb3_phy)) {

		ret = PTR_ERR(dwc->usb2_phy);

		ret = PTR_ERR(dwc->usb3_phy);



		/*

		 * if -ENXIO is returned, it means PHY layer wasn't

drivers/usb/dwc3/core.h

+2 −2
Original line number Diff line number Diff line
@@ -759,8 +759,8 @@ struct dwc3 { 


struct dwc3_event_type {

	u32	is_devspec:1;

	u32	type:6;

	u32	reserved8_31:25;

	u32	type:7;

	u32	reserved8_31:24;

} __packed;



#define DWC3_DEPEVT_XFERCOMPLETE	0x01

drivers/usb/dwc3/gadget.c

+1 −0
Original line number Diff line number Diff line
@@ -1584,6 +1584,7 @@ static int dwc3_gadget_start(struct usb_gadget *g, 
	__dwc3_gadget_ep_disable(dwc->eps[0]);



err0:

	dwc->gadget_driver = NULL;

	spin_unlock_irqrestore(&dwc->lock, flags);



	return ret;

drivers/usb/gadget/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ config USB_FUSB300 
	   Faraday usb device controller FUSB300 driver



config USB_FOTG210_UDC

	depends on HAS_DMA

	tristate "Faraday FOTG210 USB Peripheral Controller"

	help

	   Faraday USB2.0 OTG controller which can be configured as
@@ -328,13 +329,14 @@ config USB_S3C_HSUDC 


config USB_MV_UDC

	tristate "Marvell USB2.0 Device Controller"

	depends on GENERIC_HARDIRQS

	depends on GENERIC_HARDIRQS && HAS_DMA

	help

	  Marvell Socs (including PXA and MMP series) include a high speed

	  USB2.0 OTG controller, which can be configured as high speed or

	  full speed USB peripheral.



config USB_MV_U3D

	depends on HAS_DMA

	tristate "MARVELL PXA2128 USB 3.0 controller"

	help

	  MARVELL PXA2128 Processor series include a super speed USB3.0 device
@@ -639,6 +641,7 @@ config USB_CONFIGFS_RNDIS 
	depends on USB_CONFIGFS

	depends on NET

	select USB_U_ETHER

	select USB_U_RNDIS

	select USB_F_RNDIS

	help

	   Microsoft Windows XP bundles the "Remote NDIS" (RNDIS) protocol,