Merge branch 'master' of git://git.denx.de/u-boot-atmel

[karo-tx-uboot.git] / drivers / usb / host / Kconfig

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 30d1457638a8115a5c954a763a6d19bbee13252b..93323741938294b8269149fc617ecbba3a8eeb56 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -17,8 +17,23 @@ config USB_XHCI
 
 if USB_XHCI_HCD
 
+config USB_XHCI_UNIPHIER
+       bool "Support for UniPhier on-chip xHCI USB controller"
+       depends on ARCH_UNIPHIER
+       default y
+       ---help---
+         Enables support for the on-chip xHCI controller on UniPhier SoCs.
+
 endif
 
+config USB_OHCI_GENERIC
+       bool "Support for generic OHCI USB controller"
+       depends on OF_CONTROL
+       depends on DM_USB
+       default n
+       ---help---
+         Enables support for generic OHCI controller.
+
 config USB_EHCI_HCD
        bool "EHCI HCD (USB 2.0) support"
        ---help---
@@ -45,12 +60,26 @@ config USB_EHCI
 
 if USB_EHCI_HCD
 
-config USB_EHCI_UNIPHIER
-       bool "Support for Panasonic UniPhier on-chip EHCI USB controller"
-       depends on ARCH_UNIPHIER
+config USB_EHCI_MARVELL
+       bool "Support for MVEBU (AXP / A38x) on-chip EHCI USB controller"
+       depends on ARCH_MVEBU
+       default y
+       ---help---
+         Enables support for the on-chip EHCI controller on MVEBU SoCs.
+
+config USB_EHCI_MX6
+       bool "Support for i.MX6 on-chip EHCI USB controller"
+       depends on ARCH_MX6
        default y
        ---help---
-         Enables support for the on-chip EHCI controller on Panasonic
-         UniPhier SoCs.
+         Enables support for the on-chip EHCI controller on i.MX6 SoCs.
+
+config USB_EHCI_GENERIC
+       bool "Support for generic EHCI USB controller"
+       depends on OF_CONTROL
+       depends on DM_USB
+       default n
+       ---help---
+         Enables support for generic EHCI controller.
 
 endif