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

Documentation/DocBook/writing_musb_glue_layer.tmpl

0 → 100644
+873 −0

File added.

Preview size limit exceeded, changes collapsed.

Documentation/devicetree/bindings/usb/gr-udc.txt

+14 −8
Original line number Diff line number Diff line
@@ -12,17 +12,23 @@ Required properties: 


- reg : Address and length of the register set for the device



- interrupts : Interrupt numbers for this device

- interrupts : Interrupt numbers for this device. Either one interrupt number

	for all interrupts, or one for status related interrupts, one for IN

	endpoint related interrupts and one for OUT endpoint related interrupts.



Optional properties:



- epobufsizes : An array of buffer sizes for OUT endpoints. If the property is

	not present, or for endpoints outside of the array, 1024 is assumed by

	the driver.



- epibufsizes : An array of buffer sizes for IN endpoints. If the property is

	not present, or for endpoints outside of the array, 1024 is assumed by

	the driver.

- epobufsizes : Array of buffer sizes for OUT endpoints when they differ

	from the default size of 1024. The array is indexed by the OUT endpoint

	number. If the property is present it typically contains one entry for

	each OUT endpoint of the core. Fewer entries overrides the default sizes

	only for as many endpoints as the array contains.



- epibufsizes : Array of buffer sizes for IN endpoints when they differ

	from the default size of 1024. The array is indexed by the IN endpoint

	number. If the property is present it typically contains one entry for

	each IN endpoint of the core. Fewer entries overrides the default sizes

	only for as many endpoints as the array contains.



For further information look in the documentation for the GLIB IP core library:

http://www.gaisler.com/products/grlib/grip.pdf

Documentation/devicetree/bindings/usb/msm-hsusb.txt

+78 −0
Original line number Diff line number Diff line
@@ -15,3 +15,81 @@ Example EHCI controller device node: 
		usb-phy = <&usb_otg>;

	};



USB PHY with optional OTG:



Required properties:

- compatible:   Should contain:

  "qcom,usb-otg-ci" for chipsets with ChipIdea 45nm PHY

  "qcom,usb-otg-snps" for chipsets with Synopsys 28nm PHY



- regs:         Offset and length of the register set in the memory map

- interrupts:   interrupt-specifier for the OTG interrupt.



- clocks:       A list of phandle + clock-specifier pairs for the

                clocks listed in clock-names

- clock-names:  Should contain the following:

  "phy"         USB PHY reference clock

  "core"        Protocol engine clock

  "iface"       Interface bus clock

  "alt_core"    Protocol engine clock for targets with asynchronous

                reset methodology. (optional)



- vdccx-supply: phandle to the regulator for the vdd supply for

                digital circuit operation.

- v1p8-supply:  phandle to the regulator for the 1.8V supply

- v3p3-supply:  phandle to the regulator for the 3.3V supply



- resets:       A list of phandle + reset-specifier pairs for the

                resets listed in reset-names

- reset-names:  Should contain the following:

  "phy"         USB PHY controller reset

  "link"        USB LINK controller reset



- qcom,otg-control: OTG control (VBUS and ID notifications) can be one of

                1 - PHY control

                2 - PMIC control



Optional properties:

- dr_mode:      One of "host", "peripheral" or "otg". Defaults to "otg"



- qcom,phy-init-sequence: PHY configuration sequence values. This is related to Device

                Mode Eye Diagram test. Start address at which these values will be

                written is ULPI_EXT_VENDOR_SPECIFIC. Value of -1 is reserved as

                "do not overwrite default value at this address".

                For example: qcom,phy-init-sequence = < -1 0x63 >;

                Will update only value at address ULPI_EXT_VENDOR_SPECIFIC + 1.



- qcom,phy-num: Select number of pyco-phy to use, can be one of

                0 - PHY one, default

                1 - Second PHY

                Some platforms may have configuration to allow USB

                controller work with any of the two HSPHYs present.



- qcom,vdd-levels: This property must be a list of three integer values

                (no, min, max) where each value represents either a voltage

                in microvolts or a value corresponding to voltage corner.



Example HSUSB OTG controller device node:



    usb@f9a55000 {

        compatible = "qcom,usb-otg-snps";

        reg = <0xf9a55000 0x400>;

        interrupts = <0 134 0>;

        dr_mode = "peripheral";



        clocks = <&gcc GCC_XO_CLK>, <&gcc GCC_USB_HS_SYSTEM_CLK>,

                <&gcc GCC_USB_HS_AHB_CLK>;



        clock-names = "phy", "core", "iface";



        vddcx-supply = <&pm8841_s2_corner>;

        v1p8-supply = <&pm8941_l6>;

        v3p3-supply = <&pm8941_l24>;



        resets = <&gcc GCC_USB2A_PHY_BCR>, <&gcc GCC_USB_HS_BCR>;

        reset-names = "phy", "link";



        qcom,otg-control = <1>;

        qcom,phy-init-sequence = < -1 0x63 >;

        qcom,vdd-levels = <1 5 7>;

	};