USB: xhci: Add Makefile, MAINTAINERS, and Kconfig entries.

Add Makefile and Kconfig entries for the xHCI host controller driver.
List Sarah Sharp as the maintainer for the xHCI driver.

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index 2cb7566904b128a80bd507359f22031b800ff9b7..6ade3a5706227606e49bfd343ee8ccf7c43450df 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6164,6 +6164,12 @@ L:       linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wireless/rndis_wlan.c
 
+USB XHCI DRIVER
+P:     Sarah Sharp
+M:     sarah.a.sharp@intel.com
+L:     linux-usb@vger.kernel.org
+S:     Supported
+
 USB ZC0301 DRIVER
 P:     Luca Risolia
 M:     luca.risolia@studio.unibo.it

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 0a3dc5ece634ba641167a738a1aed2cbe793e269..19cb7d5480d78636f3eb036dbd77c37fc99a16d9 100644 (file)
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_USB_ISP116X_HCD) += host/
 obj-$(CONFIG_USB_OHCI_HCD)     += host/
 obj-$(CONFIG_USB_UHCI_HCD)     += host/
 obj-$(CONFIG_USB_FHCI_HCD)     += host/
+obj-$(CONFIG_USB_XHCI_HCD)     += host/
 obj-$(CONFIG_USB_SL811_HCD)    += host/
 obj-$(CONFIG_USB_U132_HCD)     += host/
 obj-$(CONFIG_USB_R8A66597_HCD) += host/

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 845479f7c70773cacff061d3a04c0f3ca0b21d86..5e2daed6176cbb9776c502aa7dd84cb53c887903 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -17,6 +17,26 @@ config USB_C67X00_HCD
          To compile this driver as a module, choose M here: the
          module will be called c67x00.
 
+config USB_XHCI_HCD
+       tristate "xHCI HCD (USB 3.0) support (EXPERIMENTAL)"
+       depends on USB && EXPERIMENTAL
+       ---help---
+         The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
+         "SuperSpeed" host controller hardware.
+
+         To compile this driver as a module, choose M here: the
+         module will be called xhci-hcd.
+
+config USB_XHCI_HCD_DEBUGGING
+       bool "Debugging for the xHCI host controller"
+       depends on USB_XHCI_HCD
+       ---help---
+         Say 'Y' to turn on debugging for the xHCI host controller driver.
+         This will spew debugging output, even in interrupt context.
+         This should only be used for debugging xHCI driver bugs.
+
+         If unsure, say N.
+
 config USB_EHCI_HCD
        tristate "EHCI HCD (USB 2.0) support"
        depends on USB && USB_ARCH_HAS_EHCI

diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index f163571e33d8dc0e61f10ec1addf50d4956baf39..289d748bb41422ae6d607130a09fe3c410037049 100644 (file)
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -12,6 +12,7 @@ fhci-objs := fhci-hcd.o fhci-hub.o fhci-q.o fhci-mem.o \
 ifeq ($(CONFIG_FHCI_DEBUG),y)
 fhci-objs += fhci-dbg.o
 endif
+xhci-objs := xhci-hcd.o xhci-mem.o xhci-pci.o xhci-ring.o xhci-hub.o xhci-dbg.o
 
 obj-$(CONFIG_USB_WHCI_HCD)     += whci/
 
@@ -23,6 +24,7 @@ obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
 obj-$(CONFIG_USB_OHCI_HCD)     += ohci-hcd.o
 obj-$(CONFIG_USB_UHCI_HCD)     += uhci-hcd.o
 obj-$(CONFIG_USB_FHCI_HCD)     += fhci.o
+obj-$(CONFIG_USB_XHCI_HCD)     += xhci.o
 obj-$(CONFIG_USB_SL811_HCD)    += sl811-hcd.o
 obj-$(CONFIG_USB_SL811_CS)     += sl811_cs.o
 obj-$(CONFIG_USB_U132_HCD)     += u132-hcd.o