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

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

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



Felipe writes:

usb: patches for v3.16 merge window

Not a lot here during this merge window. Mostly we just have
the usual miscellaneous patches (removal of unnecessary prints,
proper dependencies being added to Kconfig, build warning fixes,
new device ID, etc.

Other than those, the only important new features are the
new support for OS Strings which should help Linux Gadget
Drivers behave better under MS Windows. Also Babble Recovery
implementation for MUSB on AM335x. Lastly, we also have
ARCH_QCOM PHY support though phy-msm.

Signed-of-by: default avatarFelipe Balbi <balbi@ti.com>

Conflicts:
	drivers/usb/phy/phy-mv-u3d-usb.c
parents c311e391 7751b6fb

Documentation/ABI/testing/configfs-usb-gadget

+45 −0
Original line number Diff line number Diff line
@@ -62,6 +62,40 @@ KernelVersion: 3.11 
Description:

		This group contains functions available to this USB gadget.



What:		/config/usb-gadget/gadget/functions/<func>.<inst>/interface.<n>

Date:		May 2014

KernelVersion:	3.16

Description:

		This group contains "Feature Descriptors" specific for one

		gadget's USB interface or one interface group described

		by an IAD.



		The attributes:



		compatible_id		- 8-byte string for "Compatible ID"

		sub_compatible_id	- 8-byte string for "Sub Compatible ID"



What:		/config/usb-gadget/gadget/functions/<func>.<inst>/interface.<n>/<property>

Date:		May 2014

KernelVersion:	3.16

Description:

		This group contains "Extended Property Descriptors" specific for one

		gadget's USB interface or one interface group described

		by an IAD.



		The attributes:



		type		- value 1..7 for interpreting the data

				1: unicode string

				2: unicode string with environment variable

				3: binary

				4: little-endian 32-bit

				5: big-endian 32-bit

				6: unicode string with a symbolic link

				7: multiple unicode strings

		data		- blob of data to be interpreted depending on

				type



What:		/config/usb-gadget/gadget/strings

Date:		Jun 2013

KernelVersion:	3.11
@@ -79,3 +113,14 @@ Description: 
		product		- gadget's product description

		manufacturer	- gadget's manufacturer description



What:		/config/usb-gadget/gadget/os_desc

Date:		May 2014

KernelVersion:	3.16

Description:

		This group contains "OS String" extension handling attributes.



		use		- flag turning "OS Desctiptors" support on/off

		b_vendor_code	- one-byte value used for custom per-device and

				per-interface requests

		qw_sign		- an identifier to be reported as "OS String"

				proper

Documentation/DocBook/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ DOCBOOKS := z8530book.xml device-drivers.xml \ 
	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    80211.xml debugobjects.xml sh.xml regulator.xml \

	    alsa-driver-api.xml writing-an-alsa-driver.xml \

	    tracepoint.xml drm.xml media_api.xml w1.xml

	    tracepoint.xml drm.xml media_api.xml w1.xml \

	    writing_musb_glue_layer.xml



include Documentation/DocBook/media/Makefile