Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / drivers / usb / host / Kconfig

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index fb5aa6f889189048edb2cb53c5149eb0be9ceec2..f5f19ed775c219017abd96e65721da0f7701e326 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -31,13 +31,31 @@ config USB_XHCI_MVEBU
          SoCs, which includes Armada8K, Armada3700 and other Armada
          family SoCs.
 
+config USB_XHCI_PCI
+       bool "Support for PCI-based xHCI USB controller"
+       depends on DM_USB
+       default y if X86
+       help
+         Enables support for the PCI-based xHCI controller.
+
 config USB_XHCI_ROCKCHIP
        bool "Support for Rockchip on-chip xHCI USB controller"
        depends on ARCH_ROCKCHIP
+       depends on DM_REGULATOR
+       depends on DM_USB
        default y
        help
          Enables support for the on-chip xHCI controller on Rockchip SoCs.
 
+config USB_XHCI_STI
+       bool "Support for STMicroelectronics STiH407 family on-chip xHCI USB controller"
+       depends on ARCH_STI
+       default y
+       help
+         Enables support for the on-chip xHCI controller on STMicroelectronics
+         STiH407 family SoCs. This is a driver for the dwc3 to provide the glue logic
+         to configure the controller.
+
 config USB_XHCI_ZYNQMP
        bool "Support for Xilinx ZynqMP on-chip xHCI USB controller"
        depends on ARCH_ZYNQMP
@@ -57,6 +75,7 @@ endif # USB_XHCI_HCD
 
 config USB_EHCI_HCD
        bool "EHCI HCD (USB 2.0) support"
+       default y if ARCH_MX5 || ARCH_MX6
        select USB_HOST
        ---help---
          The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
@@ -74,12 +93,6 @@ config USB_EHCI_HCD
 
          You may want to read <file:Documentation/usb/ehci.txt>.
 
-config USB_EHCI
-       bool
-       default USB_EHCI_HCD
-       ---help---
-         TODO: rename after most boards switch to Kconfig
-
 if USB_EHCI_HCD
 
 config USB_EHCI_ATMEL
@@ -90,8 +103,8 @@ config USB_EHCI_ATMEL
          Enables support for the on-chip EHCI controller on Atmel chips.
 
 config USB_EHCI_MARVELL
-       bool "Support for MVEBU (AXP / A38x) on-chip EHCI USB controller"
-       depends on ARCH_MVEBU
+       bool "Support for Marvell on-chip EHCI USB controller"
+       depends on ARCH_MVEBU || KIRKWOOD || ORION5X
        default y
        ---help---
          Enables support for the on-chip EHCI controller on MVEBU SoCs.
@@ -110,6 +123,14 @@ config USB_EHCI_MX7
        ---help---
          Enables support for the on-chip EHCI controller on i.MX7 SoCs.
 
+config USB_EHCI_OMAP
+       bool "Support for OMAP3+ on-chip EHCI USB controller"
+       depends on ARCH_OMAP2PLUS
+       default y
+       ---help---
+         Enables support for the on-chip EHCI controller on OMAP3 and later
+         SoCs.
+
 if USB_EHCI_MX7
 
 config MXC_USB_OTG_HACTIVE
@@ -130,6 +151,12 @@ config USB_EHCI_MSM
          This driver supports combination of Chipidea USB controller
          and Synapsys USB PHY in host mode only.
 
+config USB_EHCI_PCI
+       bool "Support for PCI-based EHCI USB controller"
+       default y if X86
+       help
+         Enables support for the PCI-based EHCI controller.
+
 config USB_EHCI_ZYNQ
        bool "Support for Xilinx Zynq on-chip EHCI USB controller"
        depends on ARCH_ZYNQ
@@ -188,3 +215,13 @@ config USB_UHCI_HCD
 if USB_UHCI_HCD
 
 endif # USB_UHCI_HCD
+
+config USB_DWC2
+       bool "DesignWare USB2 Core support"
+       select USB_HOST
+       ---help---
+         The DesignWare USB 2.0 controller is compliant with the
+         USB-Implementers Forum (USB-IF) USB 2.0 specifications.
+         Hi-Speed (480 Mbps), Full-Speed (12 Mbps), and Low-Speed (1.5 Mbps)
+         operation is compliant to the controller Supplement. If you want to
+         enable this controller in host mode, say Y.