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

Commit 121a8cdd authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'for-next/gadget' of... 

Merge branch 'for-next/gadget' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

* 'for-next/gadget' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb: (50 commits)
  usb: renesas_usbhs: show error reason on usbhsh_urb_enqueu()
  usb: renesas_usbhs: add force packet remove method
  usb: renesas_usbhs: care usb_hcd_giveback_urb() status
  usb: renesas_usbhs: add usbhsh_is_running()
  usb: renesas_usbhs: disable attch irq after device attached
  usb: renesas_usbhs: care pipe sequence
  usb: renesas_usbhs: add usbhs_pipe_attach() method
  usb: renesas_usbhs: add usbhsh_endpoint_detach_all() for error case
  usb: renesas_usbhs: modify device attach method
  usb: renesas_usbhs: pop packet when urb dequeued
  usb: renesas_usbhs: add lost error value when enqueue
  usb: gadget: mv_udc: replace some debug info
  usb: gadget: mv_udc: refine suspend/resume function
  usb: gadget: mv_udc: refine the clock relative code
  usb: gadget: mv_udc: disable ISR when stopped
  usb: gadget: mv_udc: add otg relative code
  usb: gadget: Use kcalloc instead of kzalloc to allocate array
  usb: renesas_usbhs: remove the_controller_link
  usb: renesas_usbhs: add test-mode support
  usb: renesas_usbhs: call usbhsg_queue_pop() when pipe disable.
  ...
parents a1016ce3 15a3838b

Documentation/feature-removal-schedule.txt

+14 −0
Original line number Original line Diff line number Diff line
@@ -535,6 +535,20 @@ Why: In 3.0, we can now autodetect internal 3G device and already have 
	information log when acer-wmi initial.

	information log when acer-wmi initial.

Who:    Lee, Chun-Yi <jlee@novell.com>

Who:    Lee, Chun-Yi <jlee@novell.com>





---------------------------



What:	/sys/devices/platform/_UDC_/udc/_UDC_/is_dualspeed file and

	is_dualspeed line in /sys/devices/platform/ci13xxx_*/udc/device file.

When:	3.8

Why:	The is_dualspeed file is superseded by maximum_speed in the same

	directory and is_dualspeed line in device file is superseded by

	max_speed line in the same file.



	The maximum_speed/max_speed specifies maximum speed supported by UDC.

	To check if dualspeeed is supported, check if the value is >= 3.

	Various possible speeds are defined in <linux/usb/ch9.h>.

Who:	Michal Nazarewicz <mina86@mina86.com>



----------------------------

----------------------------





What:	The XFS nodelaylog mount option

What:	The XFS nodelaylog mount option

drivers/usb/dwc3/gadget.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2087,7 +2087,7 @@ int __devinit dwc3_gadget_init(struct dwc3 *dwc) 
	dev_set_name(&dwc->gadget.dev, "gadget");

	dev_set_name(&dwc->gadget.dev, "gadget");





	dwc->gadget.ops			= &dwc3_gadget_ops;

	dwc->gadget.ops			= &dwc3_gadget_ops;

	dwc->gadget.is_dualspeed	= true;

	dwc->gadget.max_speed		= USB_SPEED_SUPER;

	dwc->gadget.speed		= USB_SPEED_UNKNOWN;

	dwc->gadget.speed		= USB_SPEED_UNKNOWN;

	dwc->gadget.dev.parent		= dwc->dev;

	dwc->gadget.dev.parent		= dwc->dev;

drivers/usb/gadget/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -235,7 +235,6 @@ config USB_R8A66597 




config USB_RENESAS_USBHS_UDC

config USB_RENESAS_USBHS_UDC

	tristate 'Renesas USBHS controller'

	tristate 'Renesas USBHS controller'

	depends on SUPERH || ARCH_SHMOBILE

	depends on USB_RENESAS_USBHS

	depends on USB_RENESAS_USBHS

	select USB_GADGET_DUALSPEED

	select USB_GADGET_DUALSPEED

	help

	help

drivers/usb/gadget/amd5536udc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1959,7 +1959,7 @@ static int amd5536_start(struct usb_gadget_driver *driver, 
	u32 tmp;

	u32 tmp;





	if (!driver || !bind || !driver->setup

	if (!driver || !bind || !driver->setup

			|| driver->speed < USB_SPEED_HIGH)

			|| driver->max_speed < USB_SPEED_HIGH)

		return -EINVAL;

		return -EINVAL;

	if (!dev)

	if (!dev)

		return -ENODEV;

		return -ENODEV;
@@ -3349,7 +3349,7 @@ static int udc_probe(struct udc *dev) 
	dev_set_name(&dev->gadget.dev, "gadget");

	dev_set_name(&dev->gadget.dev, "gadget");

	dev->gadget.dev.release = gadget_release;

	dev->gadget.dev.release = gadget_release;

	dev->gadget.name = name;

	dev->gadget.name = name;

	dev->gadget.is_dualspeed = 1;

	dev->gadget.max_speed = USB_SPEED_HIGH;





	/* init registers, interrupts, ... */

	/* init registers, interrupts, ... */

	startup_registers(dev);

	startup_registers(dev);

drivers/usb/gadget/at91_udc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1633,7 +1633,7 @@ static int at91_start(struct usb_gadget_driver *driver, 
	unsigned long	flags;

	unsigned long	flags;





	if (!driver

	if (!driver

			|| driver->speed < USB_SPEED_FULL

			|| driver->max_speed < USB_SPEED_FULL

			|| !bind

			|| !bind

			|| !driver->setup) {

			|| !driver->setup) {

		DBG("bad parameter.\n");

		DBG("bad parameter.\n");