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

Commit 1a3b85ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB/PHY driver updates from Greg KH:
 "Here is the large USB and PHY driver update for 4.14-rc1.

  Not all that exciting, a few new PHY drivers, the usual mess of gadget
  driver updates and fixes, and of course, xhci updates to try to tame
  that beast.

  A number of usb-serial updates and other small fixes all over the USB
  driver tree are in here as well. Full details are in the shortlog.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'usb-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (171 commits)
  usbip: vhci-hcd: make vhci_hc_driver const
  usb: phy: Avoid unchecked dereference warning
  usb: imx21-hcd: make imx21_hc_driver const
  usb: host: make ehci_fsl_overrides const and __initconst
  dt-bindings: mt8173-mtu3: add generic compatible and rename file
  dt-bindings: mt8173-xhci: add generic compatible and rename file
  usb: xhci-mtk: add generic compatible string
  usbip: auto retry for concurrent attach
  USB: serial: option: simplify 3 D-Link device entries
  USB: serial: option: add support for D-Link DWM-157 C1
  usb: core: usbport: fix "BUG: key not in .data" when lockdep is enabled
  usb: chipidea: usb2: check memory allocation failure
  usb: Add device quirk for Logitech HD Pro Webcam C920-C
  usb: misc: lvstest: add entry to place port in compliance mode
  usb: xhci: Support enabling of compliance mode for xhci 1.1
  usb:xhci:Fix regression when ATI chipsets detected
  usb: quirks: add delay init quirk for Corsair Strafe RGB keyboard
  usb: gadget: make snd_pcm_hardware const
  usb: common: use of_property_read_bool()
  USB: core: constify vm_operations_struct
  ...
parents 04759194 46f5489f

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -12,3 +12,6 @@ Description: 
				Ethernet over USB link

				Ethernet over USB link

		dev_addr	- MAC address of device's end of this

		dev_addr	- MAC address of device's end of this

				Ethernet over USB link

				Ethernet over USB link

		class		- USB interface class, default is 02 (hex)

		subclass	- USB interface subclass, default is 06 (hex)

		protocol	- USB interface protocol, default is 00 (hex)

Documentation/ABI/testing/sysfs-bus-usb-lvstest

+13 −0
Original line number Original line Diff line number Diff line
@@ -45,3 +45,16 @@ Contact: Pratyush Anand <pratyush.anand@gmail.com> 
Description:

Description:

		Write to this node to issue "U3 exit" for Link Layer

		Write to this node to issue "U3 exit" for Link Layer

		Validation device. It is needed for TD.7.36.

		Validation device. It is needed for TD.7.36.



What:		/sys/bus/usb/devices/.../enable_compliance

Date:		July 2017

Description:

		Write to this node to set the port to compliance mode to test

		with Link Layer Validation device. It is needed for TD.7.34.



What:		/sys/bus/usb/devices/.../warm_reset

Date:		July 2017

Description:

		Write to this node to issue "Warm Reset" for Link Layer Validation

		device. It may be needed to properly reset an xHCI 1.1 host port if

		compliance mode needed to be explicitly enabled.

Documentation/devicetree/bindings/mfd/wm831x.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ Required properties: 
    ../interrupt-controller/interrupts.txt

    ../interrupt-controller/interrupts.txt





Optional sub-nodes:

Optional sub-nodes:

  - phys : Contains a phandle to the USB PHY.

  - regulators : Contains sub-nodes for each of the regulators supplied by

  - regulators : Contains sub-nodes for each of the regulators supplied by

    the device. The regulators are bound using their names listed below:

    the device. The regulators are bound using their names listed below:

Documentation/devicetree/bindings/phy/phy-mt65xx-usb.txt→Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt

+12 −5
Original line number Original line Diff line number Diff line 
mt65xx USB3.0 PHY binding

MediaTek T-PHY binding

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

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





This binding describes a usb3.0 phy for mt65xx platforms of Medaitek SoC.

T-phy controller supports physical layer functionality for a number of

controllers on MediaTek SoCs, such as, USB2.0, USB3.0, PCIe, and SATA.





Required properties (controller (parent) node):

Required properties (controller (parent) node):

 - compatible	: should be one of

 - compatible	: should be one of

		  "mediatek,mt2701-u3phy"

		  "mediatek,generic-tphy-v1"

		  "mediatek,mt2712-u3phy"

		  "mediatek,generic-tphy-v2"

		  "mediatek,mt8173-u3phy"

		  "mediatek,mt2701-u3phy" (deprecated)

		  "mediatek,mt2712-u3phy" (deprecated)

		  "mediatek,mt8173-u3phy";

		  make use of "mediatek,generic-tphy-v1" on mt2701 instead and

		  "mediatek,generic-tphy-v2" on mt2712 instead.

 - clocks	: (deprecated, use port's clocks instead) a list of phandle +

 - clocks	: (deprecated, use port's clocks instead) a list of phandle +

		  clock-specifier pairs, one for each entry in clock-names

		  clock-specifier pairs, one for each entry in clock-names

 - clock-names	: (deprecated, use port's one instead) must contain

 - clock-names	: (deprecated, use port's one instead) must contain
@@ -35,6 +40,8 @@ Required properties (port (child) node): 
		  cell after port phandle is phy type from:

		  cell after port phandle is phy type from:

			- PHY_TYPE_USB2

			- PHY_TYPE_USB2

			- PHY_TYPE_USB3

			- PHY_TYPE_USB3

			- PHY_TYPE_PCIE

			- PHY_TYPE_SATA





Example:

Example:

Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt

+10 −1
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties (phy (parent) node): 
	* "rockchip,rk3328-usb2phy"

	* "rockchip,rk3328-usb2phy"

	* "rockchip,rk3366-usb2phy"

	* "rockchip,rk3366-usb2phy"

	* "rockchip,rk3399-usb2phy"

	* "rockchip,rk3399-usb2phy"

	* "rockchip,rv1108-usb2phy"

 - reg : the address offset of grf for usb-phy configuration.

 - reg : the address offset of grf for usb-phy configuration.

 - #clock-cells : should be 0.

 - #clock-cells : should be 0.

 - clock-output-names : specify the 480m output clock name.

 - clock-output-names : specify the 480m output clock name.
@@ -18,6 +19,10 @@ Optional properties: 
		 usb-phy output 480m and xin24m.

		 usb-phy output 480m and xin24m.

		 Refer to clk/clock-bindings.txt for generic clock

		 Refer to clk/clock-bindings.txt for generic clock

		 consumer properties.

		 consumer properties.

 - rockchip,usbgrf : phandle to the syscon managing the "usb general

		 register files". When set driver will request its

		 phandle as one companion-grf for some special SoCs

		 (e.g RV1108).





Required nodes : a sub-node is required for each port the phy provides.

Required nodes : a sub-node is required for each port the phy provides.

		 The sub-node name is used to identify host or otg port,

		 The sub-node name is used to identify host or otg port,
@@ -28,10 +33,14 @@ Required nodes : a sub-node is required for each port the phy provides. 
Required properties (port (child) node):

Required properties (port (child) node):

 - #phy-cells : must be 0. See ./phy-bindings.txt for details.

 - #phy-cells : must be 0. See ./phy-bindings.txt for details.

 - interrupts : specify an interrupt for each entry in interrupt-names.

 - interrupts : specify an interrupt for each entry in interrupt-names.

 - interrupt-names : a list which shall be the following entries:

 - interrupt-names : a list which should be one of the following cases:

	Regular case:

	* "otg-id" : for the otg id interrupt.

	* "otg-id" : for the otg id interrupt.

	* "otg-bvalid" : for the otg vbus interrupt.

	* "otg-bvalid" : for the otg vbus interrupt.

	* "linestate" : for the host/otg linestate interrupt.

	* "linestate" : for the host/otg linestate interrupt.

	Some SoCs use one interrupt with the above muxed together, so for these

	* "otg-mux" : otg-port interrupt, which mux otg-id/otg-bvalid/linestate

		to one.





Optional properties:

Optional properties:

 - phy-supply : phandle to a regulator that provides power to VBUS.

 - phy-supply : phandle to a regulator that provides power to VBUS.