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

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

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

Felipe writes:

usb: patches for v4.5

A ton of improvements to dwc2 have been made. The
driver should be a lot more stable on v4.5 then ever
before.

Our good old dwc3 got a few cleanups and misc fixes
and also added support to Xilinx's integration of
this IP.

Yoshihiro Shimoda gives us support for a new USB3
peripheral controller from Renesas.

Other than these, the usual misc fixes all over the
place.
parents bfccd95e 5072cfc4

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/devicetree/bindings/usb/dwc2.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Platform DesignWare HS OTG USB 2.0 controller 
Required properties:

- compatible : One of:

  - brcm,bcm2835-usb: The DWC2 USB controller instance in the BCM2835 SoC.

  - hisilicon,hi6220-usb: The DWC2 USB controller instance in the hi6220 SoC.

  - rockchip,rk3066-usb: The DWC2 USB controller instance in the rk3066 Soc;

  - "rockchip,rk3188-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3188 Soc;

  - "rockchip,rk3288-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3288 Soc;

Documentation/devicetree/bindings/usb/dwc3-xilinx.txt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
Xilinx SuperSpeed DWC3 USB SoC controller



Required properties:

- compatible:	Should contain "xlnx,zynqmp-dwc3"

- clocks:	A list of phandles for the clocks listed in clock-names

- clock-names:	Should contain the following:

  "bus_clk"	 Master/Core clock, have to be >= 125 MHz for SS

		 operation and >= 60MHz for HS operation



  "ref_clk"	 Clock source to core during PHY power down



Required child node:

A child node must exist to represent the core DWC3 IP block. The name of

the node is not important. The content of the node is defined in dwc3.txt.



Example device node:



		usb@0 {

			#address-cells = <0x2>;

			#size-cells = <0x1>;

			status = "okay";

			compatible = "xlnx,zynqmp-dwc3";

			clock-names = "bus_clk" "ref_clk";

			clocks = <&clk125>, <&clk125>;

			ranges;



			dwc3@fe200000 {

				compatible = "snps,dwc3";

				reg = <0x0 0xfe200000 0x40000>;

				interrupts = <0x0 0x41 0x4>;

				dr_mode = "host";

			};

		};

Documentation/devicetree/bindings/usb/renesas_usb3.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Renesas Electronics USB3.0 Peripheral driver



Required properties:

  - compatible: Must contain one of the following:

	- "renesas,r8a7795-usb3-peri"

  - reg: Base address and length of the register for the USB3.0 Peripheral

  - interrupts: Interrupt specifier for the USB3.0 Peripheral

  - clocks: clock phandle and specifier pair



Example:

	usb3_peri0: usb@ee020000 {

		compatible = "renesas,r8a7795-usb3-peri";

		reg = <0 0xee020000 0 0x400>;

		interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cpg CPG_MOD 328>;

	};



	usb3_peri1: usb@ee060000 {

		compatible = "renesas,r8a7795-usb3-peri";

		reg = <0 0xee060000 0 0x400>;

		interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cpg CPG_MOD 327>;

	};

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+16 −6
Original line number Diff line number Diff line 
Renesas Electronics USBHS driver



Required properties:

  - compatible: Must contain one of the following:

	- "renesas,usbhs-r8a7790"

	- "renesas,usbhs-r8a7791"

	- "renesas,usbhs-r8a7794"

	- "renesas,usbhs-r8a7795"

  - compatible: Must contain one or more of the following:



	- "renesas,usbhs-r8a7790" for r8a7790 (R-Car H2) compatible device

	- "renesas,usbhs-r8a7791" for r8a7791 (R-Car M2-W) compatible device

	- "renesas,usbhs-r8a7792" for r8a7792 (R-Car V2H) compatible device

	- "renesas,usbhs-r8a7793" for r8a7793 (R-Car M2-N) compatible device

	- "renesas,usbhs-r8a7794" for r8a7794 (R-Car E2) compatible device

	- "renesas,usbhs-r8a7795" for r8a7795 (R-Car H3) compatible device

	- "renesas,rcar-gen2-usbhs" for R-Car Gen2 compatible device

	- "renesas,rcar-gen3-usbhs" for R-Car Gen3 compatible device



	When compatible with the generic version, nodes must list the

	SoC-specific version corresponding to the platform first followed

	by the generic version.



  - reg: Base address and length of the register for the USBHS

  - interrupts: Interrupt specifier for the USBHS

  - clocks: A list of phandle + clock specifier pairs
@@ -22,7 +32,7 @@ Optional properties: 


Example:

	usbhs: usb@e6590000 {

		compatible = "renesas,usbhs-r8a7790";

		compatible = "renesas,usbhs-r8a7790", "renesas,rcar-gen2-usbhs";

		reg = <0 0xe6590000 0 0x100>;

		interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp7_clks R8A7790_CLK_HSUSB>;