diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-01 08:59:01 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-07-01 08:59:01 -0700 |
| commit | 463c4683cfee44b82239dd88bcaea0cb29f5e041 (patch) | |
| tree | 8bf088a50c69862536856636905c677be9e64a44 | |
| parent | Merge tag 'usb-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next (diff) | |
| parent | dt-bindings: ci-hdrc-usb2: s/gadget-itc-setting/itc-setting in example (diff) | |
| download | wireguard-linux-463c4683cfee44b82239dd88bcaea0cb29f5e041.tar.xz wireguard-linux-463c4683cfee44b82239dd88bcaea0cb29f5e041.zip | |
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.
| -rw-r--r-- | Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | 2 | ||||
| -rw-r--r-- | drivers/usb/chipidea/Kconfig | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt index 1084e2bcbe1c..341dc67f3472 100644 --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt @@ -93,7 +93,7 @@ Example: phys = <&usb_phy0>; phy-names = "usb-phy"; vbus-supply = <®_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 */ diff --git a/drivers/usb/chipidea/Kconfig b/drivers/usb/chipidea/Kconfig index 3644a3500b70..5e5b9eb7ebf6 100644 --- a/drivers/usb/chipidea/Kconfig +++ b/drivers/usb/chipidea/Kconfig @@ -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. |