From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 3/9] ehci: if caps ressource is not provided discover it via cr_capbase
Date: Mon, 21 Jan 2013 21:09:50 +0100 [thread overview]
Message-ID: <1358798996-26595-3-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1358798996-26595-1-git-send-email-plagnioj@jcrosoft.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
drivers/usb/host/ehci-hcd.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 35b4f71..9315fe3 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);
}
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2013-01-21 20:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-21 20:07 [PATCH 0/9] atmel: add ehci support Jean-Christophe PLAGNIOL-VILLARD
2013-01-21 20:09 ` [PATCH 1/9] usb: add parameters info on usb device Jean-Christophe PLAGNIOL-VILLARD
2013-01-21 20:09 ` [PATCH 2/9] usb: fix for USB_ST_STALLED status reporting in ehci_submit_async() Jean-Christophe PLAGNIOL-VILLARD
2013-01-21 20:09 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2013-01-21 20:09 ` [PATCH 4/9] ehci: add atmel support Jean-Christophe PLAGNIOL-VILLARD
2013-01-21 20:09 ` [PATCH 5/9] at91: usb: allow to specicfy inverted vbus Jean-Christophe PLAGNIOL-VILLARD
2013-01-21 20:09 ` [PATCH 6/9] at91sam9g45: add ehci support Jean-Christophe PLAGNIOL-VILLARD
2013-01-21 20:09 ` [PATCH 7/9] at91sam9m10g45ek: add usb support Jean-Christophe PLAGNIOL-VILLARD
2013-01-22 8:30 ` Sascha Hauer
2013-01-22 14:15 ` Jean-Christophe PLAGNIOL-VILLARD
2013-01-22 14:24 ` Sascha Hauer
2013-01-22 14:46 ` Jean-Christophe PLAGNIOL-VILLARD
2013-01-21 20:09 ` [PATCH 8/9] at91sam9x5: add ehci support Jean-Christophe PLAGNIOL-VILLARD
2013-01-21 20:09 ` [PATCH 9/9] at91sam9x5ek: add usb support Jean-Christophe PLAGNIOL-VILLARD
2013-01-23 19:28 ` [PATCH 0/9] atmel: add ehci support Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358798996-26595-3-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox