From: mpa@pengutronix.de (Markus Pargmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [RESEND PATCH v3 1/4] usb: musb: gadget, stay IDLE without gadget driver
Date: Mon, 18 Nov 2013 16:54:35 +0100 [thread overview]
Message-ID: <1384790078-15366-2-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1384790078-15366-1-git-send-email-mpa@pengutronix.de>
If there is no gadget driver musb should stay in B_IDLE state.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
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;
}
--
1.8.4.2
next prev parent reply other threads:[~2013-11-18 15:54 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-18 15:54 [RESEND PATCH v3 0/4] usb: musb bugfixes Markus Pargmann
2013-11-18 15:54 ` Markus Pargmann [this message]
2013-11-25 15:56 ` [RESEND PATCH v3 1/4] usb: musb: gadget, stay IDLE without gadget driver Felipe Balbi
2013-11-18 15:54 ` [RESEND PATCH v3 2/4] usb: musb: Bugfix of_node assignment Markus Pargmann
2013-11-25 16:14 ` Felipe Balbi
2013-11-25 16:48 ` Sebastian Andrzej Siewior
2013-11-26 9:34 ` Markus Pargmann
2014-08-04 10:13 ` Markus Pargmann
2014-08-05 12:33 ` Sebastian Andrzej Siewior
2014-08-05 20:17 ` Felipe Balbi
2013-11-18 15:54 ` [RESEND PATCH v3 3/4] usb: musb: dsps, debugfs files Markus Pargmann
2013-11-25 15:57 ` Felipe Balbi
2013-11-26 9:25 ` Markus Pargmann
2013-11-26 16:40 ` Felipe Balbi
2013-11-18 15:54 ` [RESEND PATCH v3 4/4] usb: musb: dsps, use devm_kzalloc Markus Pargmann
2013-11-25 15:58 ` Felipe Balbi
2013-11-26 9:26 ` Markus Pargmann
2013-11-26 16:41 ` Felipe Balbi
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=1384790078-15366-2-git-send-email-mpa@pengutronix.de \
--to=mpa@pengutronix.de \
--cc=linux-arm-kernel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.