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

Commit 34a00367 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

Felipe writes:

usb: changes for v4.14 merge window

Not a big pull request this time around. Only 49 non-merge
commits. This pull request is, however, all over the place. Most of
the changes are in the bdc driver adding support for USB Phy layer and
PM.

Renesas adds support for R-Car H3 ES2.0 and R-Car M3-W SoCs.

Also here is PM_RUNTIME support for dwc3-keystone.

UDC Core got a DMA unmap fix to make sure we only unmap requests that
were, indeed, mapped.

Other than these, we have a lot of cleanups, many of them adding
'const' to several places.
parents a85c0f8d 0852659e

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/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/usb/brcm,bdc.txt

0 → 100644
+29 −0
Original line number Original line Diff line number Diff line 
Broadcom USB Device Controller (BDC)

====================================



Required properties:



- compatible: must be one of:

                "brcm,bdc-v0.16"

                "brcm,bdc"

- reg: the base register address and length

- interrupts: the interrupt line for this controller



Optional properties:



On Broadcom STB platforms, these properties are required:



- phys: phandle to one or two USB PHY blocks

        NOTE: Some SoC's have a single phy and some have

        USB 2.0 and USB 3.0 phys

- clocks: phandle to the functional clock of this block



Example:



        bdc@f0b02000 {

                compatible = "brcm,bdc-v0.16";

                reg = <0xf0b02000 0xfc4>;

                interrupts = <0x0 0x60 0x0>;

                phys = <&usbphy_0 0x0>;

                clocks = <&sw_usbd>;

        };

Documentation/devicetree/bindings/usb/keystone-usb.txt

+15 −2
Original line number Original line Diff line number Diff line
@@ -12,8 +12,21 @@ Required properties: 
   MPU.

   MPU.

 - ranges: allows valid 1:1 translation between child's address space and

 - ranges: allows valid 1:1 translation between child's address space and

   parent's address space.

   parent's address space.

 - clocks: Clock IDs array as required by the controller.



 - clock-names: names of clocks correseponding to IDs in the clock property.

SoC-specific Required Properties:

The following are mandatory properties for Keystone 2 66AK2HK, 66AK2L and 66AK2E

SoCs only:



- clocks:		Clock ID for USB functional clock.

- clock-names:		Must be "usb".





The following are mandatory properties for Keystone 2 66AK2G SoCs only:



- power-domains:	Should contain a phandle to a PM domain provider node

			and an args specifier containing the USB device id

			value. This property is as per the binding,

			Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt





Sub-nodes:

Sub-nodes:

The dwc3 core should be added as subnode to Keystone DWC3 glue.

The dwc3 core should be added as subnode to Keystone DWC3 glue.

Documentation/devicetree/bindings/usb/renesas_usb3.txt

+13 −3
Original line number Original line Diff line number Diff line
@@ -3,20 +3,30 @@ Renesas Electronics USB3.0 Peripheral driver 
Required properties:

Required properties:

  - compatible: Must contain one of the following:

  - compatible: Must contain one of the following:

	- "renesas,r8a7795-usb3-peri"

	- "renesas,r8a7795-usb3-peri"

	- "renesas,r8a7796-usb3-peri"

	- "renesas,rcar-gen3-usb3-peri" for a generic 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 USB3.0 Peripheral

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

  - interrupts: Interrupt specifier for the USB3.0 Peripheral

  - interrupts: Interrupt specifier for the USB3.0 Peripheral

  - clocks: clock phandle and specifier pair

  - clocks: clock phandle and specifier pair





Example:

Example of R-Car H3 ES1.x:

	usb3_peri0: usb@ee020000 {

	usb3_peri0: usb@ee020000 {

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

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

			     "renesas,rcar-gen3-usb3-peri";

		reg = <0 0xee020000 0 0x400>;

		reg = <0 0xee020000 0 0x400>;

		interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cpg CPG_MOD 328>;

		clocks = <&cpg CPG_MOD 328>;

	};

	};





	usb3_peri1: usb@ee060000 {

	usb3_peri1: usb@ee060000 {

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

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

			     "renesas,rcar-gen3-usb3-peri";

		reg = <0 0xee060000 0 0x400>;

		reg = <0 0xee060000 0 0x400>;

		interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;

		interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cpg CPG_MOD 327>;

		clocks = <&cpg CPG_MOD 327>;