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

Commit d57b0026 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: Add snapshot of USB DIAG function driver" into msm-next

parents a07b4b3e 0b744694

drivers/usb/gadget/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ config USB_F_AUDIO_SRC 
config USB_F_ACC

	tristate



config USB_F_DIAG

	tristate



# this first set of drivers all depend on bulk-capable hardware.



config USB_CONFIGFS
@@ -532,6 +535,14 @@ config USB_CONFIGFS_F_TCM 
	  Both protocols can work on USB2.0 and USB3.0.

	  UAS utilizes the USB 3.0 feature called streams support.



config USB_CONFIGFS_F_DIAG

	bool "USB Diag function"

	select USB_F_DIAG

	depends on USB_CONFIGFS

	help

	  Diag function driver enables support for Qualcomm diagnostics

	  port over USB.



choice

	tristate "USB Gadget precomposed configurations"

	default USB_ETH

drivers/usb/gadget/function/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -57,3 +57,5 @@ usb_f_audio_source-y := f_audio_source.o 
obj-$(CONFIG_USB_F_AUDIO_SRC)   += usb_f_audio_source.o

usb_f_accessory-y               := f_accessory.o

obj-$(CONFIG_USB_F_ACC)         += usb_f_accessory.o

usb_f_diag-y			:= f_diag.o

obj-$(CONFIG_USB_F_DIAG)	+= usb_f_diag.o