Merge branch 'omap-fixes'

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

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index c1cfed7eefb5969904cf638b931e9900ffb8b98a..1091358d12bdd611af8d96416bce6156db4f6241 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -38,6 +38,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"
@@ -120,7 +139,7 @@ config USB_ISP116X_HCD
 
 config USB_ISP1760_HCD
        tristate "ISP 1760 HCD support"
-       depends on USB && EXPERIMENTAL && (PCI || PPC_OF)
+       depends on USB && EXPERIMENTAL
        ---help---
          The ISP1760 chip is a USB 2.0 host controller.