Merge branch 'from-linus' into upstream

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

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index ed1899d307db0b320b1038f49e66e4edca8946a8..b93d71d28db7a04a011735318973181e953eedbf 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -6,19 +6,19 @@ comment "USB Host Controller Drivers"
 
 config USB_EHCI_HCD
        tristate "EHCI HCD (USB 2.0) support"
-       depends on USB && PCI
+       depends on USB && USB_ARCH_HAS_EHCI
        ---help---
          The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
          "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
          If your USB host controller supports USB 2.0, you will likely want to
-         configure this Host Controller Driver.  At this writing, the primary
-         implementation of EHCI is a chip from NEC, widely available in add-on
-         PCI cards, but implementations are in the works from other vendors
-         including Intel and Philips.  Motherboard support is appearing.
+         configure this Host Controller Driver.  At the time of this writing, 
+         the primary implementation of EHCI is a chip from NEC, widely available
+         in add-on PCI cards, but implementations are in the works from other 
+         vendors including Intel and Philips.  Motherboard support is appearing.
 
          EHCI controllers are packaged with "companion" host controllers (OHCI
          or UHCI) to handle USB 1.1 devices connected to root hub ports.  Ports
-         will connect to EHCI if it the device is high speed, otherwise they
+         will connect to EHCI if the device is high speed, otherwise they
          connect to a companion controller.  If you configure EHCI, you should
          probably configure the OHCI (for NEC and some other vendors) USB Host
          Controller Driver or UHCI (for Via motherboards) Host Controller
@@ -47,12 +47,29 @@ config USB_EHCI_ROOT_HUB_TT
          controller is needed.  It's safe to say "y" even if your
          controller doesn't support this feature.
 
-         This supports the EHCI implementation from TransDimension Inc.
+         This supports the EHCI implementation that's originally
+         from ARC, and has since changed hands a few times.
+
+config USB_EHCI_TT_NEWSCHED
+       bool "Improved Transaction Translator scheduling (EXPERIMENTAL)"
+       depends on USB_EHCI_HCD && EXPERIMENTAL
+       ---help---
+         This changes the periodic scheduling code to fill more of the low
+         and full speed bandwidth available from the Transaction Translator
+         (TT) in USB 2.0 hubs.  Without this, only one transfer will be
+         issued in each microframe, significantly reducing the number of
+         periodic low/fullspeed transfers possible.
+
+         If you have multiple periodic low/fullspeed devices connected to a
+         highspeed USB hub which is connected to a highspeed USB Host
+         Controller, and some of those devices will not work correctly
+         (possibly due to "ENOSPC" or "-28" errors), say Y.
+
+         If unsure, say N.
 
 config USB_ISP116X_HCD
        tristate "ISP116X HCD support"
        depends on USB
-       default N
        ---help---
          The ISP1160 and ISP1161 chips are USB host controllers. Enable this
          option if your board has this chip. If unsure, say N.
@@ -127,7 +144,6 @@ config USB_UHCI_HCD
 config USB_SL811_HCD
        tristate "SL811HS HCD support"
        depends on USB
-       default N
        help
          The SL811HS is a single-port USB controller that supports either
          host side or peripheral side roles.  Enable this option if your
@@ -140,7 +156,6 @@ config USB_SL811_HCD
 config USB_SL811_CS
        tristate "CF/PCMCIA support for SL811HS HCD"
        depends on USB_SL811_HCD && PCMCIA
-       default N
        help
          Wraps a PCMCIA driver around the SL811HS HCD, supporting the RATOC
          REX-CFU1U CF card (often used with PDAs).  If unsure, say N.