Changes to Makefile and Kconfig to enable building of the new
Broadcom STB OHCI, EHCI and XHCI drivers. Also update MAINTAINERS.
Signed-off-by: Al Cooper <alcoop...@gmail.com>
---
MAINTAINERS | 9 +++++++++
drivers/usb/host/Kconfig | 27 +++++++++++++++++++++++++++
drivers/usb/host/Makefile | 7 +++++++
3 files changed, 43 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 02a39617ec82..9b8e7caad2ba 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3007,6 +3007,15 @@ S: Supported
F: drivers/gpio/gpio-brcmstb.c
F: Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
+BROADCOM BRCMSTB USB XHCI, EHCI and OHCI DRIVERS
+M: Al Cooper <alcoop...@gmail.com>
+L: linux-usb@vger.kernel.org
+L: bcm-kernel-feedback-l...@broadcom.com
+S: Maintained
+F: drivers/usb/host/xhci-brcm.c
+F: drivers/usb/host/ehci-brcm.c
+F: drivers/usb/host/ohci-brcm.c
+
BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
M: Al Cooper <alcoop...@gmail.com>
L: linux-ker...@vger.kernel.org
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 1a4ea98cac2a..1693a5076980 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -798,3 +798,30 @@ config USB_HCD_TEST_MODE
This option is of interest only to developers who need to validate
their USB hardware designs. It is not needed for normal use. If
unsure, say N.
+
+config USB_OHCI_BRCM
+ tristate
+
+config USB_EHCI_BRCM
+ tristate
+
+config USB_XHCI_BRCM
+ tristate
+
+config BRCM_USB_PHY
+ tristate
+
+config USB_BRCM
+ tristate "Broadcom STB USB support"
+ depends on ARCH_BRCMSTB
+ select USB_OHCI_BRCM if USB_OHCI_HCD
+ select USB_EHCI_BRCM if USB_EHCI_HCD
+ select USB_XHCI_BRCM if USB_XHCI_HCD
+ select BRCM_USB_PHY if USB_OHCI_HCD || USB_EHCI_HCD || USB_XHCI_HCD
+ select GENERIC_PHY if BRCM_USB_PHY
+ default ARCH_BRCMSTB
+ help
+ Say Y to enable the drivers for the onchip USB controllers.
+
+ If your chipset supports power management, disabling this driver
+ will keep the device permanently powered down.
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index e6235269c151..13e4f45a3a1d 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -91,3 +91,10 @@ obj-$(CONFIG_USB_HCD_BCMA) += bcma-hcd.o
obj-$(CONFIG_USB_HCD_SSB) += ssb-hcd.o
obj-$(CONFIG_USB_FOTG210_HCD) += fotg210-hcd.o
obj-$(CONFIG_USB_MAX3421_HCD) += max3421-hcd.o
+
+# The order is important here because it controls the order that
+# the drivers will be initialized and we always need to init
+# the drivers in the order XHCI, EHCI and OHCI.
+obj-$(CONFIG_USB_XHCI_BRCM) += xhci-brcm.o
+obj-$(CONFIG_USB_EHCI_BRCM) += ehci-brcm.o
+obj-$(CONFIG_USB_OHCI_BRCM) += ohci-brcm.o
--
1.9.0.138.g2de3478
