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

Documentation/ABI/testing/sysfs-bus-usb

+10 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,16 @@ 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/over_current_count
		Date: February 2018
		Contact: Richard Leitner <richard.leitner@skidata.com>
		Description:
		Most hubs are able to detect over-current situations on their
		ports and report them to the kernel. This attribute is to expose
		the number of over-current situation occurred on a specific port
		to user space. This file will contain an unsigned 32 bit value
		which wraps to 0 after its maximum is reached.

		What: /sys/bus/usb/devices/.../(hub interface)/portX/usb3_lpm_permit
		Date: November 2015
		Contact: Lu Baolu <baolu.lu@linux.intel.com>

Documentation/ABI/testing/sysfs-class-usb_role

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		What: /sys/class/usb_role/
		Date: Jan 2018
		Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
		Description:
		Place in sysfs for USB Role Switches. USB Role Switch is a
		device that can select the data role (host or device) for USB
		port.

		What: /sys/class/usb_role/<switch>/role
		Date: Jan 2018
		Contact: Heikki Krogerus <heikki.krogerus@linux.intel.com>
		Description:
		The current role of the switch. This attribute can be used for
		requesting role swapping with non-USB Type-C ports. With USB
		Type-C ports, the ABI defined for USB Type-C connector class
		must be used.

		Valid values:
		- none
		- host
		- device

Documentation/admin-guide/kernel-parameters.txt

+58 −0

Original line number	Diff line number	Diff line
		@@ -4392,6 +4392,64 @@

		usbcore.nousb [USB] Disable the USB subsystem

		usbcore.quirks=
		[USB] A list of quirk entries to augment the built-in
		usb core quirk list. List entries are separated by
		commas. Each entry has the form
		VendorID:ProductID:Flags. The IDs are 4-digit hex
		numbers and Flags is a set of letters. Each letter
		will change the built-in quirk; setting it if it is
		clear and clearing it if it is set. The letters have
		the following meanings:
		a = USB_QUIRK_STRING_FETCH_255 (string
		descriptors must not be fetched using
		a 255-byte read);
		b = USB_QUIRK_RESET_RESUME (device can't resume
		correctly so reset it instead);
		c = USB_QUIRK_NO_SET_INTF (device can't handle
		Set-Interface requests);
		d = USB_QUIRK_CONFIG_INTF_STRINGS (device can't
		handle its Configuration or Interface
		strings);
		e = USB_QUIRK_RESET (device can't be reset
		(e.g morph devices), don't use reset);
		f = USB_QUIRK_HONOR_BNUMINTERFACES (device has
		more interface descriptions than the
		bNumInterfaces count, and can't handle
		talking to these interfaces);
		g = USB_QUIRK_DELAY_INIT (device needs a pause
		during initialization, after we read
		the device descriptor);
		h = USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL (For
		high speed and super speed interrupt
		endpoints, the USB 2.0 and USB 3.0 spec
		require the interval in microframes (1
		microframe = 125 microseconds) to be
		calculated as interval = 2 ^
		(bInterval-1).
		Devices with this quirk report their
		bInterval as the result of this
		calculation instead of the exponent
		variable used in the calculation);
		i = USB_QUIRK_DEVICE_QUALIFIER (device can't
		handle device_qualifier descriptor
		requests);
		j = USB_QUIRK_IGNORE_REMOTE_WAKEUP (device
		generates spurious wakeup, ignore
		remote wakeup capability);
		k = USB_QUIRK_NO_LPM (device can't handle Link
		Power Management);
		l = USB_QUIRK_LINEAR_FRAME_INTR_BINTERVAL
		(Device reports its bInterval as linear
		frames instead of the USB 2.0
		calculation);
		m = USB_QUIRK_DISCONNECT_SUSPEND (Device needs
		to be disconnected before suspend to
		prevent spurious wakeup);
		n = USB_QUIRK_DELAY_CTRL_MSG (Device needs a
		pause after every control message);
		Example: quirks=0781:5580:bk,0a5c:5834:gij

		usbhid.mousepoll=
		[USBHID] The interval which mice are to be polled at.

Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt

+23 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,29 @@ Example:
		reboot-offset = <0x4>;
		};

		-----------------------------------------------------------------------
		Hisilicon Hi3798CV200 Peripheral Controller

		The Hi3798CV200 Peripheral Controller controls peripherals, queries
		their status, and configures some functions of peripherals.

		Required properties:
		- compatible: Should contain "hisilicon,hi3798cv200-perictrl", "syscon"
		and "simple-mfd".
		- reg: Register address and size of Peripheral Controller.
		- #address-cells: Should be 1.
		- #size-cells: Should be 1.

		Examples:

		perictrl: peripheral-controller@8a20000 {
		compatible = "hisilicon,hi3798cv200-perictrl", "syscon",
		"simple-mfd";
		reg = <0x8a20000 0x1000>;
		#address-cells = <1>;
		#size-cells = <1>;
		};

		-----------------------------------------------------------------------
		Hisilicon Hi6220 system controller

Documentation/devicetree/bindings/phy/meson-gxl-usb2-phy.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,10 @@ Required properties:
		- #phys-cells: must be 0 (see phy-bindings.txt in this directory)

		Optional properties:
		- clocks: a phandle to the clock of this PHY
		- clock-names: must be "phy"
		- resets: a phandle to the reset line of this PHY
		- reset-names: must be "phy"
		- phy-supply: see phy-bindings.txt in this directory

Admin message