Merge git://git.denx.de/u-boot-usb

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

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 30c6b69..2f381dc 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -30,6 +30,12 @@ config USB_XHCI_DWC3_OF_SIMPLE
          Support USB2/3 functionality in simple SoC integrations with
          USB controller based on the DesignWare USB3 IP Core.
 
+config USB_XHCI_MTK
+       bool "Support for MediaTek on-chip xHCI USB controller"
+       depends on ARCH_MEDIATEK
+       help
+         Enables support for the on-chip xHCI controller on MediaTek SoCs.
+
 config USB_XHCI_MVEBU
        bool "MVEBU USB 3.0 support"
        default y
@@ -73,13 +79,6 @@ config USB_XHCI_STI
          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
-       depends on DM_USB
-       help
-         Enables support for the on-chip xHCI controller on Xilinx ZynqMP SoCs.
-
 config USB_XHCI_DRA7XX_INDEX
        int "DRA7XX xHCI USB index"
        range 0 1
@@ -95,6 +94,14 @@ config USB_XHCI_FSL
        depends on !SPL_NO_USB
        help
          Enables support for the on-chip xHCI controller on NXP Layerscape SoCs.
+
+config USB_XHCI_BRCM
+       bool "Broadcom USB3 Host XHCI controller"
+       depends on DM_USB
+       help
+         USB controller based on the Broadcom USB3 IP Core.
+         Supports USB2/3 functionality.
+
 endif # USB_XHCI_HCD
 
 config USB_EHCI_HCD
@@ -141,8 +148,8 @@ config USB_EHCI_MX5
          Enables support for the on-chip EHCI controller on i.MX5 SoCs.
 
 config USB_EHCI_MX6
-       bool "Support for i.MX6 on-chip EHCI USB controller"
-       depends on ARCH_MX6
+       bool "Support for i.MX6/i.MX7ULP on-chip EHCI USB controller"
+       depends on ARCH_MX6 || ARCH_MX7ULP
        default y
        ---help---
          Enables support for the on-chip EHCI controller on i.MX6 SoCs.
@@ -169,7 +176,7 @@ config USB_EHCI_VF
        help
          Enables support for the on-chip EHCI controller on Vybrid SoCs.
 
-if USB_EHCI_MX7
+if USB_EHCI_MX6 || USB_EHCI_MX7
 
 config MXC_USB_OTG_HACTIVE
        bool "USB Power pin high active"