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 bf8be2a41a4a79de02ac9507d3621f8d4b3a9c8b..c7d83751793c499a03fb324a4c4c49f9bd239bf4 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -28,6 +28,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 (EXPERIMENTAL)"