we can also have babble conditions with LS/FS
and we also want to recover in that case.
Because of that we will drop the check of HSMODE
and always try to run babble recovery.
Suggested-by: Bin Liu <b-liu@xxxxxx>
Signed-off-by: Felipe Balbi <balbi@xxxxxx>
---
drivers/usb/musb/musb_core.c | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 46796a4df371..bb2d38ead69b 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -863,28 +863,18 @@ b_host:
if (int_usb & MUSB_INTR_RESET) {
handled = IRQ_HANDLED;
if (devctl & MUSB_DEVCTL_HM) {
- u8 power = musb_readl(musb->mregs, MUSB_POWER);
-
/*
- * Looks like non-HS BABBLE can be ignored, but
- * HS BABBLE is an error condition.
- *
- * For HS the solution is to avoid babble in the first
- * place and fix what caused BABBLE.
- *
- * When HS BABBLE happens what we can depends on which
+ * When BABBLE happens what we can depends on which
* platform MUSB is running, because some platforms
* implemented proprietary means for 'recovering' from
* Babble conditions. One such platform is AM335x. In
- * most cases, however, the only thing we can do is drop
- * the session.
+ * most cases, however, the only thing we can do is
+ * drop the session.
*/
- if (power & MUSB_POWER_HSMODE) {
- dev_err(musb->controller, "Babble\n");
+ dev_err(musb->controller, "Babble\n");
- if (is_host_active(musb))
- musb_recover_from_babble(musb);
- }
+ if (is_host_active(musb))
+ musb_recover_from_babble(musb);
} else {
dev_dbg(musb->controller, "BUS RESET as %s\n",
usb_otg_state_string(musb->xceiv->otg->state));
--
2.3.0
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
