From: Alexander Shiyan <shc_work@mail.ru>
To: barebox@lists.infradead.org
Subject: [PATCH 1/3] usb: ohci: Clear control register at driver startup
Date: Wed, 25 May 2016 21:13:24 +0300 [thread overview]
Message-ID: <1464200006-7963-1-git-send-email-shc_work@mail.ru> (raw)
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
drivers/usb/host/ohci-at91.c | 7 -------
drivers/usb/host/ohci-hcd.c | 7 ++++---
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 0f5c8f1..0a6e5ca 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -44,8 +44,6 @@ static void at91_stop_clock(void)
static int at91_ohci_probe(struct device_d *dev)
{
- struct ohci_regs __iomem *regs = (struct ohci_regs __iomem *)dev->resource[0].start;
-
iclk = clk_get(NULL, "ohci_clk");
fclk = clk_get(NULL, "uhpck");
@@ -54,11 +52,6 @@ static int at91_ohci_probe(struct device_d *dev)
*/
at91_start_clock();
- /*
- * The USB host controller must remain in reset.
- */
- writel(0, ®s->control);
-
add_generic_device("ohci", DEVICE_ID_DYNAMIC, NULL, dev->resource[0].start,
resource_size(&dev->resource[0]), IORESOURCE_MEM, NULL);
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 612c3a1..a4795bb 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1817,14 +1817,15 @@ static int ohci_probe(struct device_d *dev)
return -ENOMEM;
memset(ohci->ohci_dev, 0, sizeof(*ohci->ohci_dev));
- usb_register_host(host);
-
iores = dev_request_mem_resource(dev, 0);
if (IS_ERR(iores))
return PTR_ERR(iores);
ohci->regs = IOMEM(iores->start);
- return 0;
+ /* Put the USB host controller into reset */
+ writel(0, &ohci->regs->control);
+
+ return usb_register_host(host);
}
static struct driver_d ohci_driver = {
--
2.4.9
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2016-05-25 18:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-25 18:13 Alexander Shiyan [this message]
2016-05-25 18:13 ` [PATCH 2/3] usb: Add OHCI platform driver Alexander Shiyan
2016-05-26 6:28 ` Sascha Hauer
2016-05-25 18:13 ` [PATCH 3/3] usb: Replace AT91 OHCI driver with platform OHCI driver Alexander Shiyan
2016-05-26 6:21 ` [PATCH 1/3] usb: ohci: Clear control register at driver startup Sascha Hauer
-- strict thread matches above, loose matches on Subject: below --
2014-12-14 11:55 Alexander Shiyan
2014-12-18 8:42 ` Alexander Shiyan
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=1464200006-7963-1-git-send-email-shc_work@mail.ru \
--to=shc_work@mail.ru \
--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