usb/host: introduce USB_ARCH_HAS_XHCI

to make it look like OHCI and EHCI, we introduce
that symbol and USB_XHCI_HCD depend on that
instead of PCI.

[bigeasy@linutronix.de: wire up USB_ARCH_HAS_HCD]

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 97c4cc7241898da0eae612325bcea818e62fe30e..251279e756fa32ed233dc3ed19aa3460d0e60ff4 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -24,6 +24,7 @@ config USB_ARCH_HAS_HCD
        boolean
        default y if USB_ARCH_HAS_OHCI
        default y if USB_ARCH_HAS_EHCI
+       default y if USB_ARCH_HAS_XHCI
        default y if PCMCIA && !M32R                    # sl811_cs
        default y if ARM                                # SL-811
        default y if BLACKFIN                           # SL-811
@@ -77,6 +78,11 @@ config USB_ARCH_HAS_EHCI
        default y if ARCH_MMP
        default PCI
 
+# some non-PCI HCDs implement xHCI
+config USB_ARCH_HAS_XHCI
+       boolean
+       default PCI
+
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
 config USB
        tristate "Support for Host-side USB"

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 13e1f672926ddf46dd10d5cce43280385e9d4039..3e5b23525d009774cd6edfa9034dbb2745a73ddd 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -19,7 +19,7 @@ config USB_C67X00_HCD
 
 config USB_XHCI_HCD
        tristate "xHCI HCD (USB 3.0) support (EXPERIMENTAL)"
-       depends on USB && PCI && EXPERIMENTAL
+       depends on USB && USB_ARCH_HAS_XHCI && EXPERIMENTAL
        ---help---
          The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
          "SuperSpeed" host controller hardware.