diff options
| author | Tom Rini <trini@konsulko.com> | 2017-11-16 09:32:04 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-11-16 09:32:04 -0500 |
| commit | ebca2083d3689c77c7d1365f1e6862b55abef8a2 (patch) | |
| tree | 34cfd94b54d9ab2f76a67744f9297694dcdffda8 /drivers | |
| parent | 72061f78462dbe09b37ec4575874a046bb9c0b03 (diff) | |
| parent | 8c1ce928f498774a3e2c3aa03534b6e6ca6d4759 (diff) | |
| download | u-boot-ebca2083d3689c77c7d1365f1e6862b55abef8a2.tar.gz | |
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pci_mvebu.c | 4 | ||||
| -rw-r--r-- | drivers/usb/host/xhci-mvebu.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c index da0aa29865..076a63f210 100644 --- a/drivers/pci/pci_mvebu.c +++ b/drivers/pci/pci_mvebu.c @@ -82,11 +82,11 @@ struct mvebu_pcie { /* * MVEBU PCIe controller needs MEMORY and I/O BARs to be mapped - * into SoCs address space. Each controller will map 32M of MEM + * into SoCs address space. Each controller will map 128M of MEM * and 64K of I/O space when registered. */ static void __iomem *mvebu_pcie_membase = (void __iomem *)MBUS_PCI_MEM_BASE; -#define PCIE_MEM_SIZE (32 << 20) +#define PCIE_MEM_SIZE (128 << 20) #if defined(CONFIG_ARMADA_38X) #define PCIE_BASE(if) \ diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index b9201a5a6a..dbdfce38da 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -35,7 +35,7 @@ struct mvebu_xhci { * Dummy implementation that can be overwritten by a board * specific function */ -__weak int board_xhci_enable(void) +__weak int board_xhci_enable(fdt_addr_t base) { return 0; } @@ -62,7 +62,7 @@ static int xhci_usb_probe(struct udevice *dev) } /* Enable USB xHCI (VBUS, reset etc) in board specific code */ - board_xhci_enable(); + board_xhci_enable(devfdt_get_addr_index(dev, 1)); return xhci_register(dev, ctx->hcd, hcor); } @@ -85,6 +85,7 @@ static int xhci_usb_ofdata_to_platdata(struct udevice *dev) static const struct udevice_id xhci_usb_ids[] = { { .compatible = "marvell,armada3700-xhci" }, + { .compatible = "marvell,armada-380-xhci" }, { .compatible = "marvell,armada-8k-xhci" }, { } }; |