From mboxrd@z Thu Jan 1 00:00:00 1970 From: mpa@pengutronix.de (Markus Pargmann) Date: Mon, 18 Nov 2013 16:54:35 +0100 Subject: [RESEND PATCH v3 1/4] usb: musb: gadget, stay IDLE without gadget driver In-Reply-To: <1384790078-15366-1-git-send-email-mpa@pengutronix.de> References: <1384790078-15366-1-git-send-email-mpa@pengutronix.de> Message-ID: <1384790078-15366-2-git-send-email-mpa@pengutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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; } -- 1.8.4.2