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

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

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



Felipe writes:

usb: patches for v4.3 merge window

New support for Allwinne SoC on the MUSB driver has been added to the list of
glue layers. MUSB also got support for building all DMA engines in one binary;
this will be great for distros.

DWC3 now has no trace of dev_dbg()/dev_vdbg() usage. We will rely solely on
tracing to debug DWC3. There was also a fix for memory corruption with EP0 when
maxpacket size transfers are > 512 bytes.

Robert's EP capabilities flags is making EP selection a lot simpler. UDCs are
now required to set these flags up when adding endpoints to the framework.

Other than these, we have the usual set of miscelaneous cleanups and minor
fixes.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parents e6bbe1d0 2f3cc24f

Documentation/ABI/testing/configfs-usb-gadget-loopback

+1 −1
Original line number Original line Diff line number Diff line
@@ -5,4 +5,4 @@ Description: 
		The attributes:

		The attributes:





		qlen		- depth of loopback queue

		qlen		- depth of loopback queue

		bulk_buflen	- buffer length
 
		buflen		- buffer length

Documentation/ABI/testing/configfs-usb-gadget-sourcesink

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,4 +9,4 @@ Description: 
		isoc_maxpacket	- 0 - 1023 (fs), 0 - 1024 (hs/ss)

		isoc_maxpacket	- 0 - 1023 (fs), 0 - 1024 (hs/ss)

		isoc_mult	- 0..2 (hs/ss only)

		isoc_mult	- 0..2 (hs/ss only)

		isoc_maxburst	- 0..15 (ss only)

		isoc_maxburst	- 0..15 (ss only)

		qlen		- buffer length
 
		buflen		- buffer length

Documentation/devicetree/bindings/usb/allwinner,sun4i-a10-musb.txt

0 → 100644
+29 −0
Original line number Original line Diff line number Diff line 
Allwinner sun4i A10 musb DRC/OTG controller

-------------------------------------------



Required properties:

 - compatible      : "allwinner,sun4i-a10-musb", "allwinner,sun6i-a31-musb"

                     or "allwinner,sun8i-a33-musb"

 - reg             : mmio address range of the musb controller

 - clocks          : clock specifier for the musb controller ahb gate clock

 - reset           : reset specifier for the ahb reset (A31 and newer only)

 - interrupts      : interrupt to which the musb controller is connected

 - interrupt-names : must be "mc"

 - phys            : phy specifier for the otg phy

 - phy-names       : must be "usb"

 - dr_mode         : Dual-Role mode must be "host" or "otg"

 - extcon          : extcon specifier for the otg phy



Example:



	usb_otg: usb@01c13000 {

		compatible = "allwinner,sun4i-a10-musb";

		reg = <0x01c13000 0x0400>;

		clocks = <&ahb_gates 0>;

		interrupts = <38>;

		interrupt-names = "mc";

		phys = <&usbphy 0>;

		phy-names = "usb";

		extcon = <&usbphy 0>;

		status = "disabled";

	};

Documentation/devicetree/bindings/usb/generic.txt

+15 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,19 @@ Optional properties: 
			"peripheral" and "otg". In case this attribute isn't

			"peripheral" and "otg". In case this attribute isn't

			passed via DT, USB DRD controllers should default to

			passed via DT, USB DRD controllers should default to

			OTG.

			OTG.

 - otg-rev: tells usb driver the release number of the OTG and EH supplement

			with which the device and its descriptors are compliant,

			in binary-coded decimal (i.e. 2.0 is 0200H). This

			property is used if any real OTG features(HNP/SRP/ADP)

			is enabled, if ADP is required, otg-rev should be

			0x0200 or above.

 - hnp-disable: tells OTG controllers we want to disable OTG HNP, normally HNP

			is the basic function of real OTG except you want it

			to be a srp-capable only B device.

 - srp-disable: tells OTG controllers we want to disable OTG SRP, SRP is

			optional for OTG device.

 - adp-disable: tells OTG controllers we want to disable OTG ADP, ADP is

			optional for OTG device.





This is an attribute to a USB controller such as:

This is an attribute to a USB controller such as:
@@ -21,4 +34,6 @@ dwc3@4a030000 { 
	usb-phy = <&usb2_phy>, <&usb3,phy>;

	usb-phy = <&usb2_phy>, <&usb3,phy>;

	maximum-speed = "super-speed";

	maximum-speed = "super-speed";

	dr_mode = "otg";

	dr_mode = "otg";

	otg-rev = <0x0200>;

	adp-disable;

};
 
};

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -52,6 +52,10 @@ Required properties: 
Optional properties:

Optional properties:

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

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





- switch-gpio:  A phandle + gpio-specifier pair. Some boards are using Dual

                SPDT USB Switch, witch is cotrolled by GPIO to de/multiplex

                D+/D- USB lines between connectors.



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

- 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

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

                written is ULPI_EXT_VENDOR_SPECIFIC. Value of -1 is reserved as

                written is ULPI_EXT_VENDOR_SPECIFIC. Value of -1 is reserved as