diff options
author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2009-04-29 22:07:13 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-16 00:44:51 -0400 |
commit | eb6bab138d8b1172edf67ef7bd2032f476b7c6ad (patch) | |
tree | 29972155863659337b8a1aa91488b775ef34f824 | |
parent | f88ba78d9ac0e1f583da4cada80b8816ca761a3f (diff) |
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>
-rw-r--r-- | MAINTAINERS | 6 | ||||
-rw-r--r-- | drivers/usb/Makefile | 1 | ||||
-rw-r--r-- | drivers/usb/host/Kconfig | 20 | ||||
-rw-r--r-- | drivers/usb/host/Makefile | 2 |
4 files changed, 29 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2cb7566904b1..6ade3a570622 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -6164,6 +6164,12 @@ L: linux-wireless@vger.kernel.org | |||
6164 | S: Maintained | 6164 | S: Maintained |
6165 | F: drivers/net/wireless/rndis_wlan.c | 6165 | F: drivers/net/wireless/rndis_wlan.c |
6166 | 6166 | ||
6167 | USB XHCI DRIVER | ||
6168 | P: Sarah Sharp | ||
6169 | M: sarah.a.sharp@intel.com | ||
6170 | L: linux-usb@vger.kernel.org | ||
6171 | S: Supported | ||
6172 | |||
6167 | USB ZC0301 DRIVER | 6173 | USB ZC0301 DRIVER |
6168 | P: Luca Risolia | 6174 | P: Luca Risolia |
6169 | M: luca.risolia@studio.unibo.it | 6175 | M: luca.risolia@studio.unibo.it |
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 0a3dc5ece634..19cb7d5480d7 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile | |||
@@ -14,6 +14,7 @@ obj-$(CONFIG_USB_ISP116X_HCD) += host/ | |||
14 | obj-$(CONFIG_USB_OHCI_HCD) += host/ | 14 | obj-$(CONFIG_USB_OHCI_HCD) += host/ |
15 | obj-$(CONFIG_USB_UHCI_HCD) += host/ | 15 | obj-$(CONFIG_USB_UHCI_HCD) += host/ |
16 | obj-$(CONFIG_USB_FHCI_HCD) += host/ | 16 | obj-$(CONFIG_USB_FHCI_HCD) += host/ |
17 | obj-$(CONFIG_USB_XHCI_HCD) += host/ | ||
17 | obj-$(CONFIG_USB_SL811_HCD) += host/ | 18 | obj-$(CONFIG_USB_SL811_HCD) += host/ |
18 | obj-$(CONFIG_USB_U132_HCD) += host/ | 19 | obj-$(CONFIG_USB_U132_HCD) += host/ |
19 | obj-$(CONFIG_USB_R8A66597_HCD) += host/ | 20 | obj-$(CONFIG_USB_R8A66597_HCD) += host/ |
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 845479f7c707..5e2daed6176c 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
@@ -17,6 +17,26 @@ config USB_C67X00_HCD | |||
17 | To compile this driver as a module, choose M here: the | 17 | To compile this driver as a module, choose M here: the |
18 | module will be called c67x00. | 18 | module will be called c67x00. |
19 | 19 | ||
20 | config USB_XHCI_HCD | ||
21 | tristate "xHCI HCD (USB 3.0) support (EXPERIMENTAL)" | ||
22 | depends on USB && EXPERIMENTAL | ||
23 | ---help--- | ||
24 | The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0 | ||
25 | "SuperSpeed" host controller hardware. | ||
26 | |||
27 | To compile this driver as a module, choose M here: the | ||
28 | module will be called xhci-hcd. | ||
29 | |||
30 | config USB_XHCI_HCD_DEBUGGING | ||
31 | bool "Debugging for the xHCI host controller" | ||
32 | depends on USB_XHCI_HCD | ||
33 | ---help--- | ||
34 | Say 'Y' to turn on debugging for the xHCI host controller driver. | ||
35 | This will spew debugging output, even in interrupt context. | ||
36 | This should only be used for debugging xHCI driver bugs. | ||
37 | |||
38 | If unsure, say N. | ||
39 | |||
20 | config USB_EHCI_HCD | 40 | config USB_EHCI_HCD |
21 | tristate "EHCI HCD (USB 2.0) support" | 41 | tristate "EHCI HCD (USB 2.0) support" |
22 | depends on USB && USB_ARCH_HAS_EHCI | 42 | depends on USB && USB_ARCH_HAS_EHCI |
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index f163571e33d8..289d748bb414 100644 --- 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 \ | |||
12 | ifeq ($(CONFIG_FHCI_DEBUG),y) | 12 | ifeq ($(CONFIG_FHCI_DEBUG),y) |
13 | fhci-objs += fhci-dbg.o | 13 | fhci-objs += fhci-dbg.o |
14 | endif | 14 | endif |
15 | xhci-objs := xhci-hcd.o xhci-mem.o xhci-pci.o xhci-ring.o xhci-hub.o xhci-dbg.o | ||
15 | 16 | ||
16 | obj-$(CONFIG_USB_WHCI_HCD) += whci/ | 17 | obj-$(CONFIG_USB_WHCI_HCD) += whci/ |
17 | 18 | ||
@@ -23,6 +24,7 @@ obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o | |||
23 | obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o | 24 | obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o |
24 | obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o | 25 | obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o |
25 | obj-$(CONFIG_USB_FHCI_HCD) += fhci.o | 26 | obj-$(CONFIG_USB_FHCI_HCD) += fhci.o |
27 | obj-$(CONFIG_USB_XHCI_HCD) += xhci.o | ||
26 | obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o | 28 | obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o |
27 | obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o | 29 | obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o |
28 | obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o | 30 | obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o |