mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-12 07:57:21 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-usb
This commit is contained in:
commit
388019f1e2
1 changed files with 81 additions and 0 deletions
|
@ -7,12 +7,15 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
#include <errno.h>
|
||||
#include <pci.h>
|
||||
#include <usb.h>
|
||||
|
||||
#include "xhci.h"
|
||||
|
||||
#ifndef CONFIG_DM_USB
|
||||
|
||||
/*
|
||||
* Create the appropriate control structures to manage a new XHCI host
|
||||
* controller.
|
||||
|
@ -58,3 +61,81 @@ int xhci_hcd_init(int index, struct xhci_hccr **ret_hccr,
|
|||
void xhci_hcd_stop(int index)
|
||||
{
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
struct xhci_pci_priv {
|
||||
struct xhci_ctrl ctrl; /* Needs to come first in this struct! */
|
||||
};
|
||||
|
||||
static void xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr,
|
||||
struct xhci_hcor **ret_hcor)
|
||||
{
|
||||
struct xhci_hccr *hccr;
|
||||
struct xhci_hcor *hcor;
|
||||
u32 cmd;
|
||||
|
||||
hccr = (struct xhci_hccr *)dm_pci_map_bar(dev,
|
||||
PCI_BASE_ADDRESS_0, PCI_REGION_MEM);
|
||||
hcor = (struct xhci_hcor *)((uintptr_t) hccr +
|
||||
HC_LENGTH(xhci_readl(&hccr->cr_capbase)));
|
||||
|
||||
debug("XHCI-PCI init hccr 0x%x and hcor 0x%x hc_length %d\n",
|
||||
(u32)hccr, (u32)hcor,
|
||||
(u32)HC_LENGTH(xhci_readl(&hccr->cr_capbase)));
|
||||
|
||||
*ret_hccr = hccr;
|
||||
*ret_hcor = hcor;
|
||||
|
||||
/* enable busmaster */
|
||||
dm_pci_read_config32(dev, PCI_COMMAND, &cmd);
|
||||
cmd |= PCI_COMMAND_MASTER;
|
||||
dm_pci_write_config32(dev, PCI_COMMAND, cmd);
|
||||
}
|
||||
|
||||
static int xhci_pci_probe(struct udevice *dev)
|
||||
{
|
||||
struct xhci_hccr *hccr;
|
||||
struct xhci_hcor *hcor;
|
||||
|
||||
xhci_pci_init(dev, &hccr, &hcor);
|
||||
|
||||
return xhci_register(dev, hccr, hcor);
|
||||
}
|
||||
|
||||
static int xhci_pci_remove(struct udevice *dev)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = xhci_deregister(dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct udevice_id xhci_pci_ids[] = {
|
||||
{ .compatible = "xhci-pci" },
|
||||
{ }
|
||||
};
|
||||
|
||||
U_BOOT_DRIVER(xhci_pci) = {
|
||||
.name = "xhci_pci",
|
||||
.id = UCLASS_USB,
|
||||
.probe = xhci_pci_probe,
|
||||
.remove = xhci_pci_remove,
|
||||
.of_match = xhci_pci_ids,
|
||||
.ops = &xhci_usb_ops,
|
||||
.platdata_auto_alloc_size = sizeof(struct usb_platdata),
|
||||
.priv_auto_alloc_size = sizeof(struct xhci_pci_priv),
|
||||
.flags = DM_FLAG_ALLOC_PRIV_DMA,
|
||||
};
|
||||
|
||||
static struct pci_device_id xhci_pci_supported[] = {
|
||||
{ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_XHCI, ~0) },
|
||||
{},
|
||||
};
|
||||
|
||||
U_BOOT_PCI_DEVICE(xhci_pci, xhci_pci_supported);
|
||||
|
||||
#endif /* CONFIG_DM_USB */
|
||||
|
|
Loading…
Reference in a new issue