projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
[oweals/u-boot.git]
/
drivers
/
usb
/
host
/
xhci-mvebu.c
diff --git
a/drivers/usb/host/xhci-mvebu.c
b/drivers/usb/host/xhci-mvebu.c
index d880af1113131b7ed96c8ecfb274fddea0751849..b6c6aaf78ec5882c406425119907ff1d29bbebfa 100644
(file)
--- a/
drivers/usb/host/xhci-mvebu.c
+++ b/
drivers/usb/host/xhci-mvebu.c
@@
-1,9
+1,8
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (C) 2015 Marvell International Ltd.
*
* MVEBU USB HOST xHCI Controller
/*
* Copyright (C) 2015 Marvell International Ltd.
*
* MVEBU USB HOST xHCI Controller
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-15,8
+14,6
@@
#include "xhci.h"
#include "xhci.h"
-DECLARE_GLOBAL_DATA_PTR;
-
struct mvebu_xhci_platdata {
fdt_addr_t hcd_base;
};
struct mvebu_xhci_platdata {
fdt_addr_t hcd_base;
};
@@
-35,7
+32,7
@@
struct mvebu_xhci {
* Dummy implementation that can be overwritten by a board
* specific function
*/
* 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;
}
{
return 0;
}
@@
-62,7
+59,7
@@
static int xhci_usb_probe(struct udevice *dev)
}
/* Enable USB xHCI (VBUS, reset etc) in board specific code */
}
/* 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);
}
return xhci_register(dev, ctx->hcd, hcor);
}
@@
-74,7
+71,7
@@
static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
/*
* Get the base address for XHCI controller from the device node
*/
/*
* Get the base address for XHCI controller from the device node
*/
- plat->hcd_base = dev_get_addr(dev);
+ plat->hcd_base = dev
fdt
_get_addr(dev);
if (plat->hcd_base == FDT_ADDR_T_NONE) {
debug("Can't get the XHCI register base address\n");
return -ENXIO;
if (plat->hcd_base == FDT_ADDR_T_NONE) {
debug("Can't get the XHCI register base address\n");
return -ENXIO;
@@
-85,6
+82,7
@@
static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
static const struct udevice_id xhci_usb_ids[] = {
{ .compatible = "marvell,armada3700-xhci" },
static const struct udevice_id xhci_usb_ids[] = {
{ .compatible = "marvell,armada3700-xhci" },
+ { .compatible = "marvell,armada-380-xhci" },
{ .compatible = "marvell,armada-8k-xhci" },
{ }
};
{ .compatible = "marvell,armada-8k-xhci" },
{ }
};