mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 11:49:32 +00:00
Revert "USB: update host controller Kconfig entries"
This reverts commit e2ced16661
.
All of these are wrong, and need to be removed for now until they can
get reworked properly.
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e2ced16661
commit
e9a92b2b37
1 changed files with 9 additions and 17 deletions
|
@ -163,28 +163,23 @@ config USB_EHCI_HCD_OMAP
|
||||||
OMAP3 and later chips.
|
OMAP3 and later chips.
|
||||||
|
|
||||||
config USB_EHCI_HCD_ORION
|
config USB_EHCI_HCD_ORION
|
||||||
tristate "Support for Marvell EBU on-chip EHCI USB controller"
|
tristate "Support for Marvell Orion on-chip EHCI USB controller"
|
||||||
depends on USB_EHCI_HCD && PLAT_ORION
|
depends on USB_EHCI_HCD && PLAT_ORION
|
||||||
default y
|
default y
|
||||||
---help---
|
---help---
|
||||||
Enables support for the on-chip EHCI controller on
|
Enables support for the on-chip EHCI controller on
|
||||||
Marvell's embedded ARM SoCs, including Orion,
|
Morvell Orion chips.
|
||||||
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
|
config USB_EHCI_HCD_VT8500
|
||||||
tristate "Support for VIA/Wondermedia on-chip EHCI USB controller"
|
tristate "Support for VT8500 on-chip EHCI USB controller"
|
||||||
depends on USB_EHCI_HCD && ARCH_VT8500
|
depends on USB_EHCI_HCD && ARCH_VT8500
|
||||||
default y
|
default y
|
||||||
---help---
|
---help---
|
||||||
Enables support for the on-chip EHCI controller on
|
Enables support for the on-chip EHCI controller on
|
||||||
VIA VT8500 and Wondermedia WM8x50 chips.
|
VT8500 chips.
|
||||||
|
|
||||||
config USB_EHCI_MSM
|
config USB_EHCI_MSM
|
||||||
bool "Support for Qualcomm QSD/MSM on-chip EHCI USB controller"
|
bool "Support for MSM on-chip EHCI USB controller"
|
||||||
depends on USB_EHCI_HCD && ARCH_MSM
|
depends on USB_EHCI_HCD && ARCH_MSM
|
||||||
select USB_EHCI_ROOT_HUB_TT
|
select USB_EHCI_ROOT_HUB_TT
|
||||||
select USB_MSM_OTG
|
select USB_MSM_OTG
|
||||||
|
@ -220,11 +215,10 @@ config USB_EHCI_SH
|
||||||
If you use the PCI EHCI controller, this option is not necessary.
|
If you use the PCI EHCI controller, this option is not necessary.
|
||||||
|
|
||||||
config USB_EHCI_S5P
|
config USB_EHCI_S5P
|
||||||
boolean "EHCI support for Samsung S5P/EXYNOS SoC Series"
|
boolean "S5P EHCI support"
|
||||||
depends on USB_EHCI_HCD && PLAT_S5P
|
depends on USB_EHCI_HCD && PLAT_S5P
|
||||||
help
|
help
|
||||||
Enable support for the Samsung S5Pxxxx and Exynos3/4/5 SOC's
|
Enable support for the S5P SOC's on-chip EHCI controller.
|
||||||
on-chip EHCI controller.
|
|
||||||
|
|
||||||
config USB_EHCI_MV
|
config USB_EHCI_MV
|
||||||
bool "EHCI support for Marvell on-chip controller"
|
bool "EHCI support for Marvell on-chip controller"
|
||||||
|
@ -234,8 +228,6 @@ config USB_EHCI_MV
|
||||||
Enables support for Marvell (including PXA and MMP series) on-chip
|
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
|
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.
|
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
|
config USB_W90X900_EHCI
|
||||||
bool "W90X900(W90P910) EHCI support"
|
bool "W90X900(W90P910) EHCI support"
|
||||||
|
|
Loading…
Reference in a new issue