From patchwork Fri Jul 23 14:36:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 59805 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 8B418B70E8 for ; Sat, 24 Jul 2010 00:36:35 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OcJMS-0007aT-BQ; Fri, 23 Jul 2010 15:36:28 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OcJMP-0007aN-RY for kernel-team@lists.ubuntu.com; Fri, 23 Jul 2010 15:36:25 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OcJMO-0006ri-0R; Fri, 23 Jul 2010 15:36:24 +0100 Received: from [193.85.232.179] (helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1OcJMN-0004T3-Qv; Fri, 23 Jul 2010 15:36:23 +0100 From: Bryan Wu To: felipe.balbi@nokia.com, linux-usb@vger.kernel.org Subject: [PATCH] musb: move usb_add_hcd to the core init code from gadget code (v2) Date: Fri, 23 Jul 2010 22:36:23 +0800 Message-Id: <1279895783-7313-1-git-send-email-bryan.wu@canonical.com> X-Mailer: git-send-email 1.7.0.4 Cc: david-b@pacbell.net, kernel-team@lists.ubuntu.com, linux-kernel@vger.kernel.org, ricardo.salveti@canonical.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/608312 v2: fix the building error on latest 2.6.35-rc kernel, since v1 was generated in 2.6.33 kernel. v1: usb_add_hcd was only called when we insmod the gadget class module or built-in that gadget class driver. If musb is configured as OTG controller, we need to insmod or built-in gadget class driver to make our Host mode fucntion works. In our Ubuntu system, normally we compiled all the gadget class drivers as modules. Then users can insmod the gadget modules as they want. But without the gadget class driver running, we needs host function to support common USB devices. This patch fix this issue and tested on omap3 beagle board and Gumstix board. Signed-off-by: Bryan Wu --- drivers/usb/musb/musb_core.c | 13 +++++-------- drivers/usb/musb/musb_gadget.c | 18 ------------------ 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 3b795c5..1b6d74c 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -1583,14 +1583,6 @@ irqreturn_t musb_interrupt(struct musb *musb) (devctl & MUSB_DEVCTL_HM) ? "host" : "peripheral", musb->int_usb, musb->int_tx, musb->int_rx); -#ifdef CONFIG_USB_GADGET_MUSB_HDRC - if (is_otg_enabled(musb) || is_peripheral_enabled(musb)) - if (!musb->gadget_driver) { - DBG(5, "No gadget driver loaded\n"); - return IRQ_HANDLED; - } -#endif - /* the core can interrupt us for multiple reasons; docs have * a generic interrupt flowchart to follow */ @@ -2128,6 +2120,11 @@ bad_config: status = musb_gadget_setup(musb); + if (is_otg_enabled(musb)) { + status = usb_add_hcd(musb_to_hcd(musb), -1, 0); + musb_start(musb); + } + DBG(1, "%s mode, status %d, dev%02x\n", is_otg_enabled(musb) ? "OTG" : "PERIPHERAL", status, diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 6fca870..9e55534 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -1761,24 +1761,6 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver) otg_set_peripheral(musb->xceiv, &musb->g); spin_unlock_irqrestore(&musb->lock, flags); - - if (is_otg_enabled(musb)) { - DBG(3, "OTG startup...\n"); - - /* REVISIT: funcall to other code, which also - * handles power budgeting ... this way also - * ensures HdrcStart is indirectly called. - */ - retval = usb_add_hcd(musb_to_hcd(musb), -1, 0); - if (retval < 0) { - DBG(1, "add_hcd failed, %d\n", retval); - spin_lock_irqsave(&musb->lock, flags); - otg_set_peripheral(musb->xceiv, NULL); - musb->gadget_driver = NULL; - musb->g.dev.driver = NULL; - spin_unlock_irqrestore(&musb->lock, flags); - } - } } return retval;