From patchwork Mon Nov 18 15:54:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Pargmann X-Patchwork-Id: 3197101 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3252CC045B for ; Mon, 18 Nov 2013 16:01:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 88A4620501 for ; Mon, 18 Nov 2013 16:00:57 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1F1DB2052D for ; Mon, 18 Nov 2013 16:00:56 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ViREd-0002yp-3p; Mon, 18 Nov 2013 15:59:36 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ViREE-0006wL-C1; Mon, 18 Nov 2013 15:59:10 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ViRDk-0006sB-Sr for linux-arm-kernel@lists.infradead.org; Mon, 18 Nov 2013 15:58:43 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1ViRD5-0002tw-5s; Mon, 18 Nov 2013 16:57:59 +0100 Received: from mpa by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1ViRD4-0003Go-1W; Mon, 18 Nov 2013 16:57:58 +0100 From: Markus Pargmann To: Felipe Balbi Subject: [RESEND PATCH v3 1/4] usb: musb: gadget, stay IDLE without gadget driver Date: Mon, 18 Nov 2013 16:54:35 +0100 Message-Id: <1384790078-15366-2-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1384790078-15366-1-git-send-email-mpa@pengutronix.de> References: <1384790078-15366-1-git-send-email-mpa@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131118_105841_220330_E5A4A149 X-CRM114-Status: GOOD ( 12.80 ) X-Spam-Score: -2.4 (--) Cc: Bin Liu , linux-usb@vger.kernel.org, kernel@pengutronix.de, Greg Kroah-Hartman , Markus Pargmann , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If there is no gadget driver musb should stay in B_IDLE state. Signed-off-by: Markus Pargmann --- drivers/usb/musb/musb_core.c | 3 --- drivers/usb/musb/musb_gadget.c | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 4db987f..8b7d903 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -831,12 +831,9 @@ b_host: case OTG_STATE_B_WAIT_ACON: dev_dbg(musb->controller, "HNP: RESET (%s), to b_peripheral\n", usb_otg_state_string(musb->xceiv->state)); - musb->xceiv->state = OTG_STATE_B_PERIPHERAL; musb_g_reset(musb); break; case OTG_STATE_B_IDLE: - musb->xceiv->state = OTG_STATE_B_PERIPHERAL; - /* FALLTHROUGH */ case OTG_STATE_B_PERIPHERAL: musb_g_reset(musb); break; diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 9a08679..c352f73 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -2110,10 +2110,20 @@ __acquires(musb->lock) * or else after HNP, as A-Device */ if (devctl & MUSB_DEVCTL_BDEVICE) { - musb->xceiv->state = OTG_STATE_B_PERIPHERAL; + if (!musb->gadget_driver) { + musb->is_active = 0; + musb->xceiv->state = OTG_STATE_B_IDLE; + } else { + musb->xceiv->state = OTG_STATE_B_PERIPHERAL; + } musb->g.is_a_peripheral = 0; } else { - musb->xceiv->state = OTG_STATE_A_PERIPHERAL; + if (!musb->gadget_driver) { + musb->is_active = 0; + musb->xceiv->state = OTG_STATE_A_IDLE; + } else { + musb->xceiv->state = OTG_STATE_A_PERIPHERAL; + } musb->g.is_a_peripheral = 1; }