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

Commit 7fd94bee authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'gadget-for-v3.8' of... 

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

USB gadget patches from Felipe:
"usb: gadget: patches for v3.8

renesas_usbhs implements ->pullup() method, switches over
to devm_request_irq(), adds support for DMA Engine and
got a few miscelaneous cleanups.

The NCM gadget got an endianness fix and the Ethernet
gadget a frame size fix.

We're finally removing the g_file_storage gadget and
sticking to g_mass_storage and the new tcm_usb_gadget
gadgets since that was a huge duplicaton of effort anyway.

While removing g_file_storage, we also had to fix a bunch
of defconfigs which were still pointing to the old gadget.

There's a big series getting us closer to being able to
introduce our configfs interface. The series converts
functions into loadable modules which will, eventually,
be registered to the configfs interface.

Other than that there's the usual typo fixes and miscelaneous
cleanups all over the place."
parents 0f89fc3f f72e3b78

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/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

arch/arm/configs/afeb9260_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ CONFIG_USB_STORAGE=y 
CONFIG_USB_GADGET=y

CONFIG_USB_ZERO=m

CONFIG_USB_GADGETFS=m

CONFIG_USB_FILE_STORAGE=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_USB_G_SERIAL=m

CONFIG_RTC_CLASS=y

CONFIG_RTC_DEBUG=y

arch/arm/configs/at91sam9260_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ CONFIG_USB_STORAGE_DEBUG=y 
CONFIG_USB_GADGET=y

CONFIG_USB_ZERO=m

CONFIG_USB_GADGETFS=m

CONFIG_USB_FILE_STORAGE=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_USB_G_SERIAL=m

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_AT91SAM9=y

arch/arm/configs/at91sam9261_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ CONFIG_USB_GADGET=y 
CONFIG_USB_ZERO=m

CONFIG_USB_ETH=m

CONFIG_USB_GADGETFS=m

CONFIG_USB_FILE_STORAGE=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_USB_G_SERIAL=m

CONFIG_MMC=y

CONFIG_MMC_ATMELMCI=m