aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-02-16 18:03:47 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-18 13:41:10 -0500
commite2ced16661b807b0a5db4f00000eaeb21da4b251 (patch)
tree9acd1d46025aaa740f6757c1a08ce03fdf2d9317 /drivers/usb/host
parent6ed3c43d05f6d0d55f17947bc287f35318fd96f8 (diff)
USB: update host controller Kconfig entries
The recent patches from Manjunath Goudar introduced two small mistakes in the Kconfig help text for the new options. Let's fix those and the other entries that have become stale over time. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/Kconfig26
1 files changed, 17 insertions, 9 deletions
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 7ac6f482e36f..a405190a72ae 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -163,23 +163,28 @@ config USB_EHCI_HCD_OMAP
163 OMAP3 and later chips. 163 OMAP3 and later chips.
164 164
165config USB_EHCI_HCD_ORION 165config USB_EHCI_HCD_ORION
166 tristate "Support for Marvell Orion on-chip EHCI USB controller" 166 tristate "Support for Marvell EBU on-chip EHCI USB controller"
167 depends on USB_EHCI_HCD && PLAT_ORION 167 depends on USB_EHCI_HCD && PLAT_ORION
168 default y 168 default y
169 ---help--- 169 ---help---
170 Enables support for the on-chip EHCI controller on 170 Enables support for the on-chip EHCI controller on
171 Morvell Orion chips. 171 Marvell's embedded ARM SoCs, including Orion,
172 Kirkwood, Dove, Armada XP, Armada 370.
173 This is different from the EHCI implementation on
174 Marvell's mobile PXA and MMP SoC, see USB_EHCI_MV
175 for those.
176
172 177
173config USB_EHCI_HCD_VT8500 178config USB_EHCI_HCD_VT8500
174 tristate "Support for VT8500 on-chip EHCI USB controller" 179 tristate "Support for VIA/Wondermedia on-chip EHCI USB controller"
175 depends on USB_EHCI_HCD && ARCH_VT8500 180 depends on USB_EHCI_HCD && ARCH_VT8500
176 default y 181 default y
177 ---help--- 182 ---help---
178 Enables support for the on-chip EHCI controller on 183 Enables support for the on-chip EHCI controller on
179 VT8500 chips. 184 VIA VT8500 and Wondermedia WM8x50 chips.
180 185
181config USB_EHCI_MSM 186config USB_EHCI_MSM
182 bool "Support for MSM on-chip EHCI USB controller" 187 bool "Support for Qualcomm QSD/MSM on-chip EHCI USB controller"
183 depends on USB_EHCI_HCD && ARCH_MSM 188 depends on USB_EHCI_HCD && ARCH_MSM
184 select USB_EHCI_ROOT_HUB_TT 189 select USB_EHCI_ROOT_HUB_TT
185 select USB_MSM_OTG 190 select USB_MSM_OTG
@@ -215,10 +220,11 @@ config USB_EHCI_SH
215 If you use the PCI EHCI controller, this option is not necessary. 220 If you use the PCI EHCI controller, this option is not necessary.
216 221
217config USB_EHCI_S5P 222config USB_EHCI_S5P
218 boolean "S5P EHCI support" 223 boolean "EHCI support for Samsung S5P/EXYNOS SoC Series"
219 depends on USB_EHCI_HCD && PLAT_S5P 224 depends on USB_EHCI_HCD && PLAT_S5P
220 help 225 help
221 Enable support for the S5P SOC's on-chip EHCI controller. 226 Enable support for the Samsung S5Pxxxx and Exynos3/4/5 SOC's
227 on-chip EHCI controller.
222 228
223config USB_EHCI_MV 229config USB_EHCI_MV
224 bool "EHCI support for Marvell on-chip controller" 230 bool "EHCI support for Marvell on-chip controller"
@@ -228,6 +234,8 @@ config USB_EHCI_MV
228 Enables support for Marvell (including PXA and MMP series) on-chip 234 Enables support for Marvell (including PXA and MMP series) on-chip
229 USB SPH and OTG controller. SPH is a single port host, and it can 235 USB SPH and OTG controller. SPH is a single port host, and it can
230 only be EHCI host. OTG is controller that can switch to host mode. 236 only be EHCI host. OTG is controller that can switch to host mode.
237 Note that there is a separate driver for Marvell's embedded ARM
238 SoCs, see USB_EHCI_HCD_ORION for those.
231 239
232config USB_W90X900_EHCI 240config USB_W90X900_EHCI
233 bool "W90X900(W90P910) EHCI support" 241 bool "W90X900(W90P910) EHCI support"