summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Balbi2011-09-23 23:19:56 +0200
committerGreg Kroah-Hartman2011-09-27 00:51:11 +0200
commit7b7200098011a3f2b66f702b6fe47122cba585a3 (patch)
treea4a9c603e9a63c16575a5d8ce2029f126c74b8a8
parentxHCI: fix debug message (diff)
downloadkernel-qcow2-linux-7b7200098011a3f2b66f702b6fe47122cba585a3.tar.gz
kernel-qcow2-linux-7b7200098011a3f2b66f702b6fe47122cba585a3.tar.xz
kernel-qcow2-linux-7b7200098011a3f2b66f702b6fe47122cba585a3.zip
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>
-rw-r--r--drivers/usb/Kconfig6
-rw-r--r--drivers/usb/host/Kconfig2
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 97c4cc724189..251279e756fa 100644
--- 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 13e1f672926d..3e5b23525d00 100644
--- 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.