From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtp9.mail.ru ([94.100.181.97]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y07mL-0007A9-2v for barebox@lists.infradead.org; Sun, 14 Dec 2014 11:56:02 +0000 From: Alexander Shiyan Date: Sun, 14 Dec 2014 14:55:28 +0300 Message-Id: <1418558130-420-1-git-send-email-shc_work@mail.ru> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 1/3] usb: ohci: Clear control register at driver startup To: barebox@lists.infradead.org Signed-off-by: Alexander Shiyan --- 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 622f5c3..e806c64 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c @@ -1810,13 +1810,14 @@ static int ohci_probe(struct device_d *dev) return -ENOMEM; memset(ohci->ohci_dev, 0, sizeof(*ohci->ohci_dev)); - usb_register_host(host); - ohci->regs = dev_request_mem_region(dev, 0); if (IS_ERR(ohci->regs)) return PTR_ERR(ohci->regs); - 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.0.4 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox