Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / usb / host / Kconfig

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index f3a75a929e0aa26dcdbaee0c75c0cfa10403f8bf..02df7955799b87a0d699de4d7d69b398ab48045d 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -41,6 +41,25 @@ config USB_EHCI_HCD
 
          To compile this driver as a module, choose M here: the
          module will be called ehci-hcd.
+choice
+       prompt "PHY/TLL mode"
+       depends on USB_EHCI_HCD && EXPERIMENTAL && ARCH_OMAP34XX
+       ---help---
+       Choose PHY or TLL mode of operation
+
+config OMAP_EHCI_PHY_MODE
+       bool "PHY mode: ISP1504 on Port1/2 (NEW 3430ES2.0)"
+       depends on USB_EHCI_HCD && EXPERIMENTAL && ARCH_OMAP34XX
+       ---help---
+         EHCI PHY mode. Port1 and Port2 are connected to ISP1504 transcievers
+
+config OMAP_EHCI_TLL_MODE
+       bool "TLL mode: (EXPERIMENTAL)"
+       depends on USB_EHCI_HCD && EXPERIMENTAL && ARCH_OMAP34XX
+       ---help---
+       OMAP EHCI controller has TLL mode of operation for all 3 ports.
+       Use this mode when no transciever is present
+endchoice
 
 config USB_EHCI_ROOT_HUB_TT
        bool "Root Hub Transaction Translators"
@@ -96,6 +115,19 @@ config USB_EHCI_HCD_PPC_OF
          Enables support for the USB controller present on the PowerPC
          OpenFirmware platform bus.
 
+config USB_OXU210HP_HCD
+       tristate "OXU210HP HCD support"
+       depends on USB
+       ---help---
+         The OXU210HP is an USB host/OTG/device controller. Enable this
+         option if your board has this chip. If unsure, say N.
+
+         This driver does not support isochronous transfers and doesn't
+         implement OTG nor USB device controllers.
+
+         To compile this driver as a module, choose M here: the
+         module will be called oxu210hp-hcd.
+
 config USB_ISP116X_HCD
        tristate "ISP116X HCD support"
        depends on USB
@@ -127,6 +159,7 @@ config USB_OHCI_HCD
        tristate "OHCI HCD support"
        depends on USB && USB_ARCH_HAS_OHCI
        select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
+       select USB_OTG_UTILS if ARCH_OMAP
        ---help---
          The Open Host Controller Interface (OHCI) is a standard for accessing
          USB 1.1 host controller hardware.  It does more in hardware than Intel's
@@ -225,6 +258,23 @@ config USB_UHCI_HCD
          To compile this driver as a module, choose M here: the
          module will be called uhci-hcd.
 
+config USB_FHCI_HCD
+       tristate "Freescale QE USB Host Controller support"
+       depends on USB && OF_GPIO && QE_GPIO && QUICC_ENGINE
+       select FSL_GTM
+       select QE_USB
+       help
+         This driver enables support for Freescale QE USB Host Controller
+         (as found on MPC8360 and MPC8323 processors), the driver supports
+         Full and Low Speed USB.
+
+config FHCI_DEBUG
+       bool "Freescale QE USB Host Controller debug support"
+       depends on USB_FHCI_HCD && DEBUG_FS
+       help
+         Say "y" to see some FHCI debug information and statistics
+         throught debugfs.
+
 config USB_U132_HCD
        tristate "Elan U132 Adapter Host Controller"
        depends on USB && USB_FTDI_ELAN