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

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

Merge tag 'usb-v4.8-rc1' of... 

Merge tag 'usb-v4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next

Peter writes:

Hi Greg,

Below are changes for v4.8-rc1, none is important, only the documentation
update for chipidea.
parents 215db948 ebfad91c

Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ Example: 
		phys = <&usb_phy0>;

		phy-names = "usb-phy";

		vbus-supply = <&reg_usb0_vbus>;

		gadget-itc-setting = <0x4>; /* 4 micro-frames */

		itc-setting = <0x4>; /* 4 micro-frames */

		 /* Incremental burst of unspecified length */

		ahb-burst-config = <0x0>;

		tx-burst-size-dword = <0x10>; /* 64 bytes */

drivers/usb/chipidea/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ config USB_CHIPIDEA 
	select EXTCON

	help

	  Say Y here if your system has a dual role high speed USB

	  controller based on ChipIdea silicon IP. Currently, only the

	  peripheral mode is supported.

	  controller based on ChipIdea silicon IP. It supports:

	  Dual-role switch (ID, OTG FSM, sysfs), Host-only, and

	  Peripheral-only.



	  When compiled dynamically, the module will be called ci-hdrc.ko.