usb: host: Add ability to build new Broadcom STB USB drivers

Add the build system changes needed to get the Broadcom STB XHCI,
EHCI and OHCI functionality working. The OHCI support does not
require anything unique to Broadcom so the standard ohci-platform
driver is being used. Also update MAINTAINERS.

Signed-off-by: Al Cooper <alcooperx@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20200512150019.25903-6-alcooperx@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index e93b7b9deeea06942f6b6edc4eb553f9cc60ada6..f71212eb845e305229b5300eebfe8a2e09734836 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3481,6 +3481,14 @@ S:       Supported
 F:     Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
 F:     drivers/i2c/busses/i2c-brcmstb.c
 
+BROADCOM BRCMSTB USB EHCI DRIVER
+M:     Al Cooper <alcooperx@gmail.com>
+L:     linux-usb@vger.kernel.org
+L:     bcm-kernel-feedback-list@broadcom.com
+S:     Maintained
+F:     Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml
+F:     drivers/usb/host/ehci-brcm.*
+
 BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER
 M:     Al Cooper <alcooperx@gmail.com>
 L:     linux-kernel@vger.kernel.org

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 55bdfdf11e4c680d0aedbcdb140eb6818612786e..973386bbb522b0fa3579f2030d26dff59a8912a2 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -97,6 +97,26 @@ config USB_XHCI_TEGRA
 
 endif # USB_XHCI_HCD
 
+config USB_EHCI_BRCMSTB
+       tristate
+
+config USB_BRCMSTB
+       tristate "Broadcom STB USB support"
+       depends on (ARCH_BRCMSTB && PHY_BRCM_USB) || COMPILE_TEST
+       select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
+       select USB_EHCI_BRCMSTB if USB_EHCI_HCD
+       select USB_XHCI_PLATFORM if USB_XHCI_HCD
+       help
+         Enables support for XHCI, EHCI and OHCI host controllers
+         found in Broadcom STB SoC's.
+
+         To compile these drivers as modules, choose M here: the
+         modules will be called ohci-platform.ko, ehci-brcm.ko and
+         xhci-plat-hcd.ko
+
+         Disabling this will keep the controllers and corresponding
+         PHYs powered down.
+
 config USB_EHCI_HCD
        tristate "EHCI HCD (USB 2.0) support"
        depends on HAS_DMA && HAS_IOMEM

diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index b191361257cc5d0d738624edd744a68bcb5d4b3e..8782956e89ae890ffa3423453e68ca3ea2e406da 100644 (file)
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -49,6 +49,7 @@ obj-$(CONFIG_USB_EHCI_HCD_STI)        += ehci-st.o
 obj-$(CONFIG_USB_EHCI_EXYNOS)  += ehci-exynos.o
 obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o
 obj-$(CONFIG_USB_EHCI_TEGRA)   += ehci-tegra.o
+obj-$(CONFIG_USB_EHCI_BRCMSTB) += ehci-brcm.o
 
 obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o
 obj-$(CONFIG_USB_ISP116X_HCD)  += isp116x-hcd.o