diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-01-21 21:09:50 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-23 08:56:56 +0100 |
| commit | e1bb118d0e295c888bb57de63277b7a988d0550c (patch) | |
| tree | 9c5ed3ae472c44ba41a60df165bf7456fe9e1d50 /drivers/usb/host/ehci-hcd.c | |
| parent | 3cb0138d4068d4f502e1af5d6443c3034993073e (diff) | |
| download | barebox-e1bb118d0e295c888bb57de63277b7a988d0550c.tar.gz barebox-e1bb118d0e295c888bb57de63277b7a988d0550c.tar.xz | |
ehci: if caps ressource is not provided discover it via cr_capbase
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 35b4f711a9..9315fe3bf4 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -843,9 +843,14 @@ int ehci_register(struct device_d *dev, struct ehci_data *data) dev->priv = ehci; ehci->flags = data->flags; ehci->hccr = data->hccr; - ehci->hcor = data->hcor; ehci->dev = dev; + if (data->hcor) + ehci->hcor = data->hcor; + else + ehci->hcor = (void __iomem *)ehci->hccr + + HC_LENGTH(ehci_readl(&ehci->hccr->cr_capbase)); + ehci->qh_list = dma_alloc_coherent(sizeof(struct QH) * NUM_TD); ehci->td = dma_alloc_coherent(sizeof(struct qTD) * NUM_TD); @@ -879,13 +884,16 @@ static int ehci_probe(struct device_d *dev) else data.flags = EHCI_HAS_TT; - if (dev->num_resources < 2) { - printf("echi: need 2 resources base and data"); + if (dev->num_resources < 1) { + printf("echi: need 1 resources base and data"); return -ENODEV; } data.hccr = dev_request_mem_region(dev, 0); - data.hcor = dev_request_mem_region(dev, 1); + if (dev->num_resources > 1) + data.hcor = dev_request_mem_region(dev, 1); + else + data.hcor = NULL; return ehci_register(dev, &data); } |