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

Commit ba01a87e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'usb-target-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

Pull usb-gadget scsi-target merge from Nicholas Bellinger:
 "As promised, here is the pull request for Sebastian's usb-gadget
  target UASP / BOT driver for v3.5-rc1.  This code has been in
  linux-next for a number of weeks, and is now ready for an initial
  merge.

  This fabric uses the target framework to provide a usb gadget device.
  This gadget supports the USB Attached SCSI Protocol (UASP) and Bulk
  Only Transfers (BOT or BBB).  BOT is the primary interface, UAS is the
  alternative interface.

  Note this series is dependent upon a single target core patch for
  adding se_cmd->unknown_data_length in target-pending/for-next, that
  got merged in the parent.

  Kudos to Sebastian for making this driver happen so easily, and for
  his patches to improve usb-core and target core along the way to his
  goal.  Also thanks to Felipe + Greg-KH for their help in getting this
  driver ready for mainline."

* 'usb-target-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  usb-gadget: Initial merge of target module for UASP + BOT
parents c9bfa7d7 c52661d6

drivers/usb/gadget/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -798,6 +798,16 @@ config USB_MASS_STORAGE 
	  Say "y" to link the driver statically, or "m" to build

	  a dynamically linked module called "g_mass_storage".



config USB_GADGET_TARGET

	tristate "USB Gadget Target Fabric Module"

	depends on TARGET_CORE

	help

	  This fabric is an USB gadget. Two USB protocols are supported that is

	  BBB or BOT (Bulk Only Transport) and UAS (USB Attached SCSI). BOT is

	  advertised on alternative interface 0 (primary) and UAS is on

	  alternative interface 1. Both protocols can work on USB2.0 and USB3.0.

	  UAS utilizes the USB 3.0 feature called streams support.



config USB_G_SERIAL

	tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"

	help

drivers/usb/gadget/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ g_nokia-y := nokia.o 
g_webcam-y			:= webcam.o

g_ncm-y				:= ncm.o

g_acm_ms-y			:= acm_ms.o

g_tcm_usb_gadget-y		:= tcm_usb_gadget.o



obj-$(CONFIG_USB_ZERO)		+= g_zero.o

obj-$(CONFIG_USB_AUDIO)		+= g_audio.o
@@ -71,3 +72,4 @@ obj-$(CONFIG_USB_G_NOKIA) += g_nokia.o 
obj-$(CONFIG_USB_G_WEBCAM)	+= g_webcam.o

obj-$(CONFIG_USB_G_NCM)		+= g_ncm.o

obj-$(CONFIG_USB_G_ACM_MS)	+= g_acm_ms.o

obj-$(CONFIG_USB_GADGET_TARGET)	+= tcm_usb_gadget.o