usb: xhci: Add Marvell MVEBU xHCI support

This patch adds DM based support for the xHCI USB 3.0 controller
integrated in the Armada 3700 SoC. It may be extended to be used
by other MVEBU SoCs as well.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Nadav Haklai <nadavh@marvell.com>
Cc: Kostya Porotchkin <kostap@marvell.com>
Cc: Wilson Ding <dingwei@marvell.com>
Cc: Victor Gu <xigu@marvell.com>
Cc: Hua Jing <jinghua@marvell.com>
Cc: Terry Zhou <bjzhou@marvell.com>
Cc: Hanna Hawa <hannah@marvell.com>
Cc: Haim Boot <hayim@marvell.com>
Acked-by: Marek Vasut <marex@denx.de>

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 61e13d76e651038dafee61b38bf4435bdfcae8f5..b9c5fbe381fb3e460f8085e5f059cd2bd96e0571 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -21,6 +21,15 @@ config USB_XHCI_DWC3
          Say Y or if your system has a Dual Role SuperSpeed
          USB controller based on the DesignWare USB3 IP Core.
 
+config USB_XHCI_MVEBU
+       bool "MVEBU USB 3.0 support"
+       default y
+       depends on ARCH_MVEBU
+       help
+         Choose this option to add support for USB 3.0 driver on mvebu
+         SoCs, which includes Armada8K, Armada3700 and other Armada
+         family SoCs.
+
 config USB_XHCI_ROCKCHIP
        bool "Support for Rockchip on-chip xHCI USB controller"
        depends on ARCH_ROCKCHIP

diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index de253284fbaeae86b7d84e37edea6df63e7ad202..58c0cf54c21310ecc408ba384819f83ec1ad8ba2 100644 (file)
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -61,6 +61,7 @@ obj-$(CONFIG_USB_XHCI_ZYNQMP) += xhci-zynqmp.o
 obj-$(CONFIG_USB_XHCI_KEYSTONE) += xhci-keystone.o
 obj-$(CONFIG_USB_XHCI_EXYNOS) += xhci-exynos5.o
 obj-$(CONFIG_USB_XHCI_FSL) += xhci-fsl.o
+obj-$(CONFIG_USB_XHCI_MVEBU) += xhci-mvebu.o
 obj-$(CONFIG_USB_XHCI_OMAP) += xhci-omap.o
 obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o
 

diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
new file mode 100644 (file)
index 0000000..e09e87a
--- /dev/null
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2015 Marvell International Ltd.
+ *
+ * MVEBU USB HOST xHCI Controller
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <fdtdec.h>
+#include <usb.h>
+#include <asm/gpio.h>
+
+#include "xhci.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct mvebu_xhci_platdata {
+       fdt_addr_t hcd_base;
+};
+
+/**
+ * Contains pointers to register base addresses
+ * for the usb controller.
+ */
+struct mvebu_xhci {
+       struct xhci_ctrl ctrl;  /* Needs to come first in this struct! */
+       struct usb_platdata usb_plat;
+       struct xhci_hccr *hcd;
+};
+
+/*
+ * Dummy implementation that can be overwritten by a board
+ * specific function
+ */
+__weak int board_xhci_enable(void)
+{
+       return 0;
+}
+
+static int xhci_usb_probe(struct udevice *dev)
+{
+       struct mvebu_xhci_platdata *plat = dev_get_platdata(dev);
+       struct mvebu_xhci *ctx = dev_get_priv(dev);
+       struct xhci_hcor *hcor;
+       int len;
+
+       ctx->hcd = (struct xhci_hccr *)plat->hcd_base;
+       len = HC_LENGTH(xhci_readl(&ctx->hcd->cr_capbase));
+       hcor = (struct xhci_hcor *)((uintptr_t)ctx->hcd + len);
+
+       /* Enable USB xHCI (VBUS, reset etc) in board specific code */
+       board_xhci_enable();
+
+       return xhci_register(dev, ctx->hcd, hcor);
+}
+
+static int xhci_usb_remove(struct udevice *dev)
+{
+       return xhci_deregister(dev);
+}
+
+static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
+{
+       struct mvebu_xhci_platdata *plat = dev_get_platdata(dev);
+
+       /*
+        * Get the base address for XHCI controller from the device node
+        */
+       plat->hcd_base = dev_get_addr(dev);
+       if (plat->hcd_base == FDT_ADDR_T_NONE) {
+               debug("Can't get the XHCI register base address\n");
+               return -ENXIO;
+       }
+
+       return 0;
+}
+
+static const struct udevice_id xhci_usb_ids[] = {
+       { .compatible = "marvell,armada3700-xhci" },
+       { }
+};
+
+U_BOOT_DRIVER(usb_xhci) = {
+       .name   = "xhci_mvebu",
+       .id     = UCLASS_USB,
+       .of_match = xhci_usb_ids,
+       .ofdata_to_platdata = xhci_usb_ofdata_to_platdata,
+       .probe = xhci_usb_probe,
+       .remove = xhci_usb_remove,
+       .ops    = &xhci_usb_ops,
+       .platdata_auto_alloc_size = sizeof(struct mvebu_xhci_platdata),
+       .priv_auto_alloc_size = sizeof(struct mvebu_xhci),
+       .flags  = DM_FLAG_ALLOC_PRIV_DMA,
+};