summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-07-01 08:59:01 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-07-01 08:59:01 -0700
commit463c4683cfee44b82239dd88bcaea0cb29f5e041 (patch)
tree8bf088a50c69862536856636905c677be9e64a44 /drivers/usb
parent215db9481814bfae69cde49d82865c74189e435f (diff)
parentebfad91c5da3b32d83aaad280d6918867aea501c (diff)
downloadlinux-463c4683cfee44b82239dd88bcaea0cb29f5e041.tar.bz2
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.
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/chipidea/Kconfig5
1 files changed, 3 insertions, 2 deletions
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.