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

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

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

Felipe writes:

usb: patches for v4.10 merge window

One big merge this time with a total of 166 non-merge commits.

Most of the work, by far, is on dwc2 this time (68.2%) with dwc3 a far
second (22.5%). The remaining 9.3% are scattered on gadget drivers.

The most important changes for dwc2 are the peripheral side DMA support
implemented by Synopsys folks and support for the new IOT dwc2
compatible core from Synopsys.

In dwc3 land we have support for high-bandwidth, high-speed isochronous
endpoints and some non-critical fixes for large scatter lists.

Apart from these, we have our usual set of cleanups, non-critical fixes,
etc.
parents 37be6676 d5c024f3

Documentation/devicetree/bindings/usb/dwc2.txt

+4 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Required properties: 
  - "lantiq,xrx200-usb": The DWC2 USB controller instance in Lantiq XRX SoCs;

  - "amlogic,meson8b-usb": The DWC2 USB controller instance in Amlogic Meson8b SoCs;

  - "amlogic,meson-gxbb-usb": The DWC2 USB controller instance in Amlogic S905 SoCs;

  - "amcc,dwc-otg": The DWC2 USB controller instance in AMCC Canyonlands 460EX SoCs;

  - snps,dwc2: A generic DWC2 USB controller with default parameters.

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

- interrupts : Should contain 1 interrupt
@@ -25,11 +26,13 @@ Optional properties: 
Refer to phy/phy-bindings.txt for generic phy consumer properties

- dr_mode: shall be one of "host", "peripheral" and "otg"

  Refer to usb/generic.txt

- g-use-dma: enable dma usage in gadget driver.

- g-rx-fifo-size: size of rx fifo size in gadget mode.

- g-np-tx-fifo-size: size of non-periodic tx fifo size in gadget mode.

- g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0) in gadget mode.



Deprecated properties:

- g-use-dma: gadget DMA mode is automatically detected



Example:



        usb@101c0000 {

arch/arm/boot/dts/rk3036.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ 
		g-np-tx-fifo-size = <16>;

		g-rx-fifo-size = <275>;

		g-tx-fifo-size = <256 128 128 64 64 32>;

		g-use-dma;

		status = "disabled";

	};

arch/arm/boot/dts/rk3288.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -596,7 +596,6 @@ 
		g-np-tx-fifo-size = <16>;

		g-rx-fifo-size = <275>;

		g-tx-fifo-size = <256 128 128 64 64 32>;

		g-use-dma;

		phys = <&usbphy0>;

		phy-names = "usb2-phy";

		status = "disabled";

arch/arm/boot/dts/rk3xxx.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ 
		g-np-tx-fifo-size = <16>;

		g-rx-fifo-size = <275>;

		g-tx-fifo-size = <256 128 128 64 64 32>;

		g-use-dma;

		phys = <&usbphy0>;

		phy-names = "usb2-phy";

		status = "disabled";

arch/arm64/boot/dts/hisilicon/hi6220.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -747,7 +747,6 @@ 
			clocks = <&sys_ctrl HI6220_USBOTG_HCLK>;

			clock-names = "otg";

			dr_mode = "otg";

			g-use-dma;

			g-rx-fifo-size = <512>;

			g-np-tx-fifo-size = <128>;

			g-tx-fifo-size = <128 128 128 128 128 128>;