Commit 414a6750 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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



Pull USB patches from Greg Kroah-Hartman:
 "Here's the big set of USB patches for 3.8-rc1.

  Lots of USB host driver cleanups in here, and a bit of a reorg of the
  EHCI driver to make it easier for the different EHCI platform drivers
  to all work together nicer, which was a reduction in overall code.  We
  also deleted some unused firmware files, and got rid of the very old
  file_storage usb gadget driver that had been broken for a long time.
  This means we ended up removing way more code than added, always a
  nice thing to see:
	 310 files changed, 3028 insertions(+), 10754 deletions(-)

  Other than that, the usual set of new device ids, driver fixes, gadget
  driver and controller updates and the like.

  All of these have been in the linux-next tree for a number of weeks.

  Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* tag 'usb-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (228 commits)
  USB: mark uas driver as BROKEN
  xhci: Add Lynx Point LP to list of Intel switchable hosts
  uwb: fix uwb_dev_unlock() missed at an error path in uwb_rc_cmd_async()
  USB: ftdi_sio: Add support for Newport AGILIS motor drivers
  MAINTAINERS: remove drivers/block/ub.c
  USB: chipidea: fix use after free bug
  ezusb: add dependency to USB
  usb: ftdi_sio: fixup BeagleBone A5+ quirk
  USB: cp210x: add Virtenio Preon32 device id
  usb: storage: remove redundant memset() in usb_probe_stor1()
  USB: option: blacklist network interface on Huawei E173
  USB: OHCI: workaround for hardware bug: retired TDs not added to the Done Queue
  USB: add new zte 3g-dongle's pid to option.c
  USB: opticon: switch to generic read implementation
  USB: opticon: refactor reab-urb processing
  USB: opticon: use usb-serial bulk-in urb
  USB: opticon: increase bulk-in size
  USB: opticon: use port as urb context
  USB: opticon: pass port to get_serial_info
  USB: opticon: make private data port specific
  ...
parents c6bd5bcc fb37ef98

Documentation/DocBook/gadget.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ than a kernel driver. 
<para>There's a USB Mass Storage class driver, which provides

a different solution for interoperability with systems such

as MS-Windows and MacOS.

That <emphasis>File-backed Storage</emphasis> driver uses a

That <emphasis>Mass Storage</emphasis> driver uses a

file or block device as backing store for a drive,

like the <filename>loop</filename> driver.

The USB host uses the BBB, CB, or CBI versions of the mass

Documentation/devices.txt

+0 −3
Original line number Diff line number Diff line
@@ -2561,9 +2561,6 @@ Your cooperation is appreciated. 
		192 = /dev/usb/yurex1	First USB Yurex device

		   ...

		209 = /dev/usb/yurex16	16th USB Yurex device

		240 = /dev/usb/dabusb0	First daubusb device

		    ...

		243 = /dev/usb/dabusb3	Fourth dabusb device



180 block	USB block devices

		  0 = /dev/uba		First USB block device

Documentation/devicetree/bindings/usb/am33xx-usb.txt

+4 −4
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ AM33XX MUSB GLUE 
 - ti,hwmods : must be "usb_otg_hs"

 - multipoint : Should be "1" indicating the musb controller supports

   multipoint. This is a MUSB configuration-specific setting.

 - num_eps : Specifies the number of endpoints. This is also a

 - num-eps : Specifies the number of endpoints. This is also a

   MUSB configuration-specific setting. Should be set to "16"

 - ram_bits : Specifies the ram address size. Should be set to "12"

 - port0_mode : Should be "3" to represent OTG. "1" signifies HOST and "2"

 - ram-bits : Specifies the ram address size. Should be set to "12"

 - port0-mode : Should be "3" to represent OTG. "1" signifies HOST and "2"

   represents PERIPHERAL.

 - port1_mode : Should be "1" to represent HOST. "3" signifies OTG and "2"

 - port1-mode : Should be "1" to represent HOST. "3" signifies OTG and "2"

   represents PERIPHERAL.

 - power : Should be "250". This signifies the controller can supply upto

   500mA when operating in host mode.

Documentation/usb/error-codes.txt

+4 −3
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ Non-USB-specific: 


USB-specific:



-EBUSY		The URB is already active.



-ENODEV		specified USB-device or bus doesn't exist



-ENOENT		specified interface or endpoint does not exist or
@@ -35,9 +37,8 @@ USB-specific: 
		d) ISO: number_of_packets is < 0

		e) various other cases



-EAGAIN		a) specified ISO start frame too early

		b) (using ISO-ASAP) too much scheduled for the future

		   wait some time and try again.

-EXDEV		ISO: URB_ISO_ASAP wasn't specified and all the frames

		the URB would be scheduled in have already expired.



-EFBIG		Host controller driver can't schedule that many ISO frames.

Documentation/usb/mass-storage.txt

+7 −8
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ 


  This document describes how to use the gadget from user space, its

  relation to mass storage function (or MSF) and different gadgets

  using it, and how it differs from File Storage Gadget (or FSG).  It

  will talk only briefly about how to use MSF within composite

  gadgets.

  using it, and how it differs from File Storage Gadget (or FSG)

  (which is no longer included in Linux).  It will talk only briefly

  about how to use MSF within composite gadgets.



* Module parameters
@@ -198,16 +198,15 @@ 
  The Mass Storage Function and thus the Mass Storage Gadget has been

  based on the File Storage Gadget.  The difference between the two is

  that MSG is a composite gadget (ie. uses the composite framework)

  while file storage gadget is a traditional gadget.  From userspace

  while file storage gadget was a traditional gadget.  From userspace

  point of view this distinction does not really matter, but from

  kernel hacker's point of view, this means that (i) MSG does not

  duplicate code needed for handling basic USB protocol commands and

  (ii) MSF can be used in any other composite gadget.



  Because of that, File Storage Gadget has been deprecated and

  scheduled to be removed in Linux 3.8.  All users need to transition

  to the Mass Storage Gadget by that time.  The two gadgets behave

  mostly the same from the outside except:

  Because of that, File Storage Gadget has been removed in Linux 3.8.

  All users need to transition to the Mass Storage Gadget.  The two

  gadgets behave mostly the same from the outside except:



  1. In FSG the “removable” and “cdrom” module parameters set the flag

     for all logical units whereas in MSG they accept a list of y/n