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

Commit 894025f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB/PHY updates from Greg KH:
 "Here is the big set of USB and PHY driver updates for 4.15-rc1.

  There is the usual amount of gadget and xhci driver updates, along
  with phy and chipidea enhancements. There's also a lot of SPDX tags
  and license boilerplate cleanups as well, which provide some churn in
  the diffstat.

  Other major thing is the typec code that moved out of staging and into
  the "real" part of the drivers/usb/ tree, which was nice to see
  happen.

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

* tag 'usb-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (263 commits)
  usb: gadget: f_fs: Fix use-after-free in ffs_free_inst
  USB: usbfs: compute urb->actual_length for isochronous
  usb: core: message: remember to reset 'ret' to 0 when necessary
  USB: typec: Remove remaining redundant license text
  USB: typec: add SPDX identifiers to some files
  USB: renesas_usbhs: rcar?.h: add SPDX tags
  USB: chipidea: ci_hdrc_tegra.c: add SPDX line
  USB: host: xhci-debugfs: add SPDX lines
  USB: add SPDX identifiers to all remaining Makefiles
  usb: host: isp1362-hcd: remove a couple of redundant assignments
  USB: adutux: remove redundant variable minor
  usb: core: add a new usb_get_ptm_status() helper
  usb: core: add a 'type' parameter to usb_get_status()
  usb: core: introduce a new usb_get_std_status() helper
  usb: core: rename usb_get_status() 'type' argument to 'recip'
  usb: core: add Status Type definitions
  USB: gadget: Remove redundant license text
  USB: gadget: function: Remove redundant license text
  USB: gadget: udc: Remove redundant license text
  USB: gadget: legacy: Remove redundant license text
  ...
parents fb0255fb cdafb6d8

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

0 → 100644
+43 −0
Original line number Diff line number Diff line 
Broadcom STB USB PHY



Required properties:

 - compatible: brcm,brcmstb-usb-phy

 - reg: two offset and length pairs.

	The first pair specifies a manditory set of memory mapped

	registers used for general control of the PHY.

	The second pair specifies optional registers used by some of

	the SoCs that support USB 3.x

 - #phy-cells: Shall be 1 as it expects one argument for setting

	       the type of the PHY. Possible values are:

	       - PHY_TYPE_USB2 for USB1.1/2.0 PHY

	       - PHY_TYPE_USB3 for USB3.x PHY



Optional Properties:

- clocks : clock phandles.

- clock-names: String, clock name.

- brcm,ipp: Boolean, Invert Port Power.

  Possible values are: 0 (Don't invert), 1 (Invert)

- brcm,ioc: Boolean, Invert Over Current detection.

  Possible values are: 0 (Don't invert), 1 (Invert)

NOTE: one or both of the following two properties must be set

- brcm,has-xhci: Boolean indicating the phy has an XHCI phy.

- brcm,has-eohci: Boolean indicating the phy has an EHCI/OHCI phy.

- dr_mode: String, PHY Device mode.

  Possible values are: "host", "peripheral ", "drd" or "typec-pd"

  If this property is not defined, the phy will default to "host" mode.



Example:



usbphy_0: usb-phy@f0470200 {

	reg = <0xf0470200 0xb8>,

		<0xf0471940 0x6c0>;

	compatible = "brcm,brcmstb-usb-phy";

	#phy-cells = <1>;

	dr_mode = "host"

	brcm,ioc = <1>;

	brcm,ipp = <1>;

	brcm,has-xhci;

	brcm,has-eohci;

	clocks = <&usb20>, <&usb30>;

	clock-names = "sw_usb", "sw_usb3";

};

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

+10 −1
Original line number Diff line number Diff line
@@ -27,7 +27,16 @@ Sub-nodes optional properties: 
     This property is not applicable for "brcm,iproc-ns2-sata-phy",

     "brcm,iproc-nsp-sata-phy" and "brcm,iproc-sr-sata-phy".



Example:

- brcm,rxaeq-mode: string that indicates the desired RX equalizer

  mode, possible values are:

	"off" (equivalent to not specifying the property)

	"auto"

	"manual" (brcm,rxaeq-value is used in that case)



- brcm,rxaeq-value: when 'rxaeq-mode' is set to "manual", provides the RX

  equalizer value that should be used. Allowed range is 0..63.



Example

	sata-phy@f0458100 {

		compatible = "brcm,bcm7445-sata-phy", "brcm,phy-sata3";

		reg = <0xf0458100 0x1e00>, <0xf045804c 0x10>;

Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt

+5 −2
Original line number Diff line number Diff line
@@ -4,10 +4,13 @@ This file provides information on what the device node for the R-Car generation 
2 USB PHY contains.



Required properties:

- compatible: "renesas,usb-phy-r8a7790" if the device is a part of R8A7790 SoC.

- compatible: "renesas,usb-phy-r8a7743" if the device is a part of R8A7743 SoC.

	      "renesas,usb-phy-r8a7745" if the device is a part of R8A7745 SoC.

	      "renesas,usb-phy-r8a7790" if the device is a part of R8A7790 SoC.

	      "renesas,usb-phy-r8a7791" if the device is a part of R8A7791 SoC.

	      "renesas,usb-phy-r8a7794" if the device is a part of R8A7794 SoC.

	      "renesas,rcar-gen2-usb-phy" for a generic R-Car Gen2 compatible device.

	      "renesas,rcar-gen2-usb-phy" for a generic R-Car Gen2 or

					  RZ/G1 compatible device.



	      When compatible with the generic version, nodes must list the

	      SoC-specific version corresponding to the platform first

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

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ Required properties: 
	      SoC.

	      "renesas,usb2-phy-r8a7796" if the device is a part of an R8A7796

	      SoC.

	      "renesas,usb2-phy-r8a77995" if the device is a part of an

	      R8A77995 SoC.

	      "renesas,rcar-gen3-usb2-phy" for a generic R-Car Gen3 compatible device.



	      When compatible with the generic version, nodes must list the

Documentation/devicetree/bindings/usb/dwc2.txt

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ Required properties: 
  configured in FS mode;

  - "st,stm32f4x9-hsotg": The DWC2 USB HS controller instance in STM32F4x9 SoCs

  configured in HS mode;

  - "st,stm32f7xx-hsotg": The DWC2 USB HS controller instance in STM32F7xx SoCs

    configured in HS mode;

- reg : Should contain 1 register range (address and length)

- interrupts : Should contain 1 interrupt

- clocks: clock provider specifier