Merge tag 'usb-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (237f38c3) · Commits · 戴 / test

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -10,3 +10,5 @@ Description:
		isoc_mult - 0..2 (hs/ss only)
		isoc_maxburst - 0..15 (ss only)
		buflen - buffer length
		bulk_qlen - depth of queue for bulk
		iso_qlen - depth of queue for iso

Documentation/ABI/testing/sysfs-bus-usb

+20 −7

Original line number	Diff line number	Diff line
		@@ -134,19 +134,21 @@ Description:
		enabled for the device. Developer can write y/Y/1 or n/N/0 to
		the file to enable/disable the feature.

		What: /sys/bus/usb/devices/.../power/usb3_hardware_lpm
		Date: June 2015
		What: /sys/bus/usb/devices/.../power/usb3_hardware_lpm_u1
		/sys/bus/usb/devices/.../power/usb3_hardware_lpm_u2
		Date: November 2015
		Contact: Kevin Strasser <kevin.strasser@linux.intel.com>
		Lu Baolu <baolu.lu@linux.intel.com>
		Description:
		If CONFIG_PM is set and a USB 3.0 lpm-capable device is plugged
		in to a xHCI host which supports link PM, it will check if U1
		and U2 exit latencies have been set in the BOS descriptor; if
		the check is is passed and the host supports USB3 hardware LPM,
		the check is passed and the host supports USB3 hardware LPM,
		USB3 hardware LPM will be enabled for the device and the USB
		device directory will contain a file named
		power/usb3_hardware_lpm. The file holds a string value (enable
		or disable) indicating whether or not USB3 hardware LPM is
		enabled for the device.
		device directory will contain two files named
		power/usb3_hardware_lpm_u1 and power/usb3_hardware_lpm_u2. These
		files hold a string value (enable or disable) indicating whether
		or not USB3 hardware LPM U1 or U2 is enabled for the device.

		What: /sys/bus/usb/devices/.../removable
		Date: February 2012
		@@ -187,6 +189,17 @@ Description:
		The file will read "hotplug", "wired" and "not used" if the
		information is available, and "unknown" otherwise.

		What: /sys/bus/usb/devices/.../(hub interface)/portX/usb3_lpm_permit
		Date: November 2015
		Contact: Lu Baolu <baolu.lu@linux.intel.com>
		Description:
		Some USB3.0 devices are not friendly to USB3 LPM. usb3_lpm_permit
		attribute allows enabling/disabling usb3 lpm of a port. It takes
		effect both before and after a usb device is enumerated. Supported
		values are "0" if both u1 and u2 are NOT permitted, "u1" if only u1
		is permitted, "u2" if only u2 is permitted, "u1_u2" if both u1 and
		u2 are permitted.

		What: /sys/bus/usb/devices/.../power/usb2_lpm_l1_timeout
		Date: May 2013
		Contact: Mathias Nyman <mathias.nyman@linux.intel.com>

Documentation/devicetree/bindings/phy/brcm,brcmstb-sata-phy.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@

		Required properties:
		- compatible: should be one or more of
		"brcm,bcm7425-sata-phy"
		"brcm,bcm7445-sata-phy"
		"brcm,phy-sata3"
		- address-cells: should be 1

Documentation/devicetree/bindings/phy/phy-hi6220-usb.txt

0 → 100644

+16 −0

Original line number	Diff line number	Diff line
		Hisilicon hi6220 usb PHY
		-----------------------

		Required properties:
		- compatible: should be "hisilicon,hi6220-usb-phy"
		- #phy-cells: must be 0
		- hisilicon,peripheral-syscon: phandle of syscon used to control phy.
		Refer to phy/phy-bindings.txt for the generic PHY binding properties

		Example:
		usb_phy: usbphy {
		compatible = "hisilicon,hi6220-usb-phy";
		#phy-cells = <0>;
		phy-supply = <&fixed_5v_hub>;
		hisilicon,peripheral-syscon = <&sys_ctrl>;
		};

Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		* Renesas R-Car generation 3 USB 2.0 PHY

		This file provides information on what the device node for the R-Car generation
		3 USB 2.0 PHY contains.

		Required properties:
		- compatible: "renesas,usb2-phy-r8a7795" if the device is a part of an R8A7795
		SoC.
		- reg: offset and length of the partial USB 2.0 Host register block.
		- reg-names: must be "usb2_host".
		- clocks: clock phandle and specifier pair(s).
		- #phy-cells: see phy-bindings.txt in the same directory, must be <0>.

		Optional properties:
		To use a USB channel where USB 2.0 Host and HSUSB (USB 2.0 Peripheral) are
		combined, the device tree node should set HSUSB properties to reg and reg-names
		properties. This is because HSUSB has registers to select USB 2.0 host or
		peripheral at that channel:
		- reg: offset and length of the partial HSUSB register block.
		- reg-names: must be "hsusb".
		- interrupts: interrupt specifier for the PHY.

		Example (R-Car H3):

		usb-phy@ee080200 {
		compatible = "renesas,usb2-phy-r8a7795";
		reg = <0 0xee080200 0 0x700>, <0 0xe6590100 0 0x100>;
		reg-names = "usb2_host", "hsusb";
		interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&mstp7_clks R8A7795_CLK_EHCI0>,
		<&mstp7_clks R8A7795_CLK_HSUSB>;
		};

		usb-phy@ee0a0200 {
		compatible = "renesas,usb2-phy-r8a7795";
		reg = <0 0xee0a0200 0 0x700>;
		reg-names = "usb2_host";
		clocks = <&mstp7_clks R8A7795_CLK_EHCI0>;
		};

Admin message