usb: host: xhci-plat: add support for the Armada 375/38x XHCI controllers

The Armada 375 and 38x SoCs come with an XHCI controller that requires
some specific initialization related to the MBus windows
configuration. This patch adds the support for this special
configuration as an XHCI quirk executed during probe.

Two new compatible strings are added to identify the Armada 375 and
Armada 38x XHCI controllers, and therefore enable the relevant quirk.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 52144c7..22b5062 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -29,6 +29,14 @@ if USB_XHCI_HCD
 config USB_XHCI_PLATFORM
        tristate
 
+config USB_XHCI_MVEBU
+       tristate "xHCI support for Marvell Armada 375/38x"
+       select USB_XHCI_PLATFORM
+       depends on ARCH_MVEBU || COMPILE_TEST
+       ---help---
+         Say 'Y' to enable the support for the xHCI host controller
+         found in Marvell Armada 375/38x ARM SOCs.
+
 endif # USB_XHCI_HCD
 
 config USB_EHCI_HCD

diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index ea2bec5..af89a90 100644 (file)
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -19,6 +19,9 @@ xhci-hcd-$(CONFIG_PCI)        += xhci-pci.o
 
 ifneq ($(CONFIG_USB_XHCI_PLATFORM), )
        xhci-hcd-y              += xhci-plat.o
+ifneq ($(CONFIG_USB_XHCI_MVEBU), )
+       xhci-hcd-y              += xhci-mvebu.o
+endif
 endif
 
 obj-$(CONFIG_USB_WHCI_HCD)     += whci/

diff --cc drivers/usb/host/xhci-mvebu.c
Simple merge

diff --cc drivers/usb/host/xhci-mvebu.h
Simple merge

diff --cc drivers/usb/host/xhci-plat.c
Simple merge