Merge tag 'usb-for-v4.6' of http://git.kernel.org/pub/scm/linux/kernel/git/balbi...

[deliverable/linux.git] / drivers / usb / host / Kconfig

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index af6201601f93d34ce24062b294b1e178f3e053a3..3050b18b24477c805a1efc52446760c3a2458399 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -18,7 +18,7 @@ config USB_C67X00_HCD
 
 config USB_XHCI_HCD
        tristate "xHCI HCD (USB 3.0) support"
-       depends on HAS_IOMEM
+       depends on HAS_DMA && HAS_IOMEM
        ---help---
          The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
          "SuperSpeed" host controller hardware.
@@ -64,7 +64,7 @@ config USB_XHCI_MVEBU
 config USB_XHCI_RCAR
        tristate "xHCI support for Renesas R-Car SoCs"
        select USB_XHCI_PLATFORM
-       depends on ARCH_SHMOBILE || COMPILE_TEST
+       depends on ARCH_RENESAS || COMPILE_TEST
        ---help---
          Say 'Y' to enable the support for the xHCI host controller
          found in Renesas R-Car ARM SoCs.
@@ -73,7 +73,7 @@ endif # USB_XHCI_HCD
 
 config USB_EHCI_HCD
        tristate "EHCI HCD (USB 2.0) support"
-       depends on HAS_IOMEM
+       depends on HAS_DMA && HAS_IOMEM
        ---help---
          The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
          "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
@@ -125,9 +125,6 @@ config USB_EHCI_TT_NEWSCHED
 
          If unsure, say Y.
 
-config USB_FSL_MPH_DR_OF
-       tristate
-
 if USB_EHCI_HCD
 
 config USB_EHCI_PCI
@@ -160,7 +157,6 @@ config USB_EHCI_FSL
        tristate "Support for Freescale PPC on-chip EHCI USB controller"
        depends on FSL_SOC
        select USB_EHCI_ROOT_HUB_TT
-       select USB_FSL_MPH_DR_OF if OF
        ---help---
          Variation of ARC USB block used in some Freescale chips.
 
@@ -332,6 +328,7 @@ endif # USB_EHCI_HCD
 
 config USB_OXU210HP_HCD
        tristate "OXU210HP HCD support"
+       depends on HAS_IOMEM
        ---help---
          The OXU210HP is an USB host/OTG/device controller. Enable this
          option if your board has this chip. If unsure, say N.
@@ -356,6 +353,7 @@ config USB_ISP116X_HCD
 
 config USB_ISP1362_HCD
        tristate "ISP1362 HCD support"
+       depends on HAS_IOMEM
        ---help---
          Supports the Philips ISP1362 chip as a host controller
 
@@ -366,8 +364,7 @@ config USB_ISP1362_HCD
 
 config USB_FOTG210_HCD
        tristate "FOTG210 HCD support"
-       depends on USB
-       depends on HAS_IOMEM
+       depends on USB && HAS_DMA && HAS_IOMEM
        ---help---
          Faraday FOTG210 is an OTG controller which can be configured as
          an USB2.0 host. It is designed to meet USB2.0 EHCI specification
@@ -389,7 +386,7 @@ config USB_MAX3421_HCD
 
 config USB_OHCI_HCD
        tristate "OHCI HCD (USB 1.1) support"
-       depends on HAS_IOMEM
+       depends on HAS_DMA && HAS_IOMEM
        ---help---
          The Open Host Controller Interface (OHCI) is a standard for accessing
          USB 1.1 host controller hardware.  It does more in hardware than Intel's