From 58be1bf847eab20fff509b57bb3abd07c5e6d450 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sat, 16 Feb 2013 23:03:47 +0000 Subject: [PATCH] --- yaml --- r: 354737 b: refs/heads/master c: e2ced16661b807b0a5db4f00000eaeb21da4b251 h: refs/heads/master i: 354735: d4f409cebe556593bd21b8547e14c98b88253ada v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/Kconfig | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 6e177ffc3143..584c2b585f6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ed3c43d05f6d0d55f17947bc287f35318fd96f8 +refs/heads/master: e2ced16661b807b0a5db4f00000eaeb21da4b251 diff --git a/trunk/drivers/usb/host/Kconfig b/trunk/drivers/usb/host/Kconfig index 7ac6f482e36f..a405190a72ae 100644 --- a/trunk/drivers/usb/host/Kconfig +++ b/trunk/drivers/usb/host/Kconfig @@ -163,23 +163,28 @@ config USB_EHCI_HCD_OMAP OMAP3 and later chips. config USB_EHCI_HCD_ORION - tristate "Support for Marvell Orion on-chip EHCI USB controller" + tristate "Support for Marvell EBU on-chip EHCI USB controller" depends on USB_EHCI_HCD && PLAT_ORION default y ---help--- Enables support for the on-chip EHCI controller on - Morvell Orion chips. + Marvell's embedded ARM SoCs, including Orion, + Kirkwood, Dove, Armada XP, Armada 370. + This is different from the EHCI implementation on + Marvell's mobile PXA and MMP SoC, see USB_EHCI_MV + for those. + config USB_EHCI_HCD_VT8500 - tristate "Support for VT8500 on-chip EHCI USB controller" + tristate "Support for VIA/Wondermedia on-chip EHCI USB controller" depends on USB_EHCI_HCD && ARCH_VT8500 default y ---help--- Enables support for the on-chip EHCI controller on - VT8500 chips. + VIA VT8500 and Wondermedia WM8x50 chips. config USB_EHCI_MSM - bool "Support for MSM on-chip EHCI USB controller" + bool "Support for Qualcomm QSD/MSM on-chip EHCI USB controller" depends on USB_EHCI_HCD && ARCH_MSM select USB_EHCI_ROOT_HUB_TT select USB_MSM_OTG @@ -215,10 +220,11 @@ config USB_EHCI_SH If you use the PCI EHCI controller, this option is not necessary. config USB_EHCI_S5P - boolean "S5P EHCI support" - depends on USB_EHCI_HCD && PLAT_S5P - help - Enable support for the S5P SOC's on-chip EHCI controller. + boolean "EHCI support for Samsung S5P/EXYNOS SoC Series" + depends on USB_EHCI_HCD && PLAT_S5P + help + Enable support for the Samsung S5Pxxxx and Exynos3/4/5 SOC's + on-chip EHCI controller. config USB_EHCI_MV bool "EHCI support for Marvell on-chip controller" @@ -228,6 +234,8 @@ config USB_EHCI_MV Enables support for Marvell (including PXA and MMP series) on-chip USB SPH and OTG controller. SPH is a single port host, and it can only be EHCI host. OTG is controller that can switch to host mode. + Note that there is a separate driver for Marvell's embedded ARM + SoCs, see USB_EHCI_HCD_ORION for those. config USB_W90X900_EHCI bool "W90X900(W90P910) EHCI support"