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 d97b16b52efa051f39c3d2fd1cf97a1b961a58d6..d6d8e7edc1e66271227558bf355eb254ee50f6d4 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -4,6 +4,19 @@
 comment "USB Host Controller Drivers"
        depends on USB
 
+config USB_C67X00_HCD
+       tristate "Cypress C67x00 HCD support"
+       depends on USB
+       help
+         The Cypress C67x00 (EZ-Host/EZ-OTG) chips are dual-role
+         host/peripheral/OTG USB controllers.
+
+         Enable this option to support this chip in host controller mode.
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called c67x00.
+
 config USB_EHCI_HCD
        tristate "EHCI HCD (USB 2.0) support"
        depends on USB && USB_ARCH_HAS_EHCI
@@ -28,10 +41,29 @@ 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)"
-       depends on USB_EHCI_HCD && EXPERIMENTAL
+       bool "Root Hub Transaction Translators"
+       depends on USB_EHCI_HCD
        ---help---
          Some EHCI chips have vendor-specific extensions to integrate
          transaction translators, so that no OHCI or UHCI companion
@@ -69,10 +101,9 @@ config USB_EHCI_BIG_ENDIAN_DESC
        default y
 
 config USB_EHCI_FSL
-       bool
-       depends on USB_EHCI_HCD
+       bool "Support for Freescale on-chip EHCI USB controller"
+       depends on USB_EHCI_HCD && FSL_SOC
        select USB_EHCI_ROOT_HUB_TT
-       default y if MPC834x || PPC_MPC831x
        ---help---
          Variation of ARC USB block used in some Freescale chips.
 
@@ -96,6 +127,32 @@ config USB_ISP116X_HCD
          To compile this driver as a module, choose M here: the
          module will be called isp116x-hcd.
 
+config USB_ISP1760_HCD
+       tristate "ISP 1760 HCD support"
+       depends on USB && EXPERIMENTAL
+       ---help---
+         The ISP1760 chip is a USB 2.0 host controller.
+
+         This driver does not support isochronous transfers or OTG.
+
+         To compile this driver as a module, choose M here: the
+         module will be called isp1760-hcd.
+
+config USB_ISP1760_PCI
+       bool "Support for the PCI bus"
+       depends on USB_ISP1760_HCD && PCI
+       ---help---
+         Enables support for the device present on the PCI bus.
+         This should only be required if you happen to have the eval kit from
+         NXP and you are going to test it.
+
+config USB_ISP1760_OF
+       bool "Support for the OF platform bus"
+       depends on USB_ISP1760_HCD && PPC_OF
+       ---help---
+         Enables support for the device present on the PowerPC
+         OpenFirmware platform bus.
+
 config USB_OHCI_HCD
        tristate "OHCI HCD support"
        depends on USB && USB_ARCH_HAS_OHCI
@@ -261,3 +318,9 @@ config USB_R8A66597_HCD
          To compile this driver as a module, choose M here: the
          module will be called r8a66597-hcd.
 
+config SUPERH_ON_CHIP_R8A66597
+       boolean "Enable SuperH on-chip USB like the R8A66597"
+       depends on USB_R8A66597_HCD && CPU_SUBTYPE_SH7366
+       help
+          Renesas SuperH processor has USB like the R8A66597.
+          This driver supported processor is SH7366.