From: Felipe Balbi <balbi@ti.com>
Date: Thu, 26 Feb 2015 20:43:57 +0000 (-0600)
Subject: usb: musb: core: always try to recover from babble
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=34754dec8ab83799a0a37f2a7ada8ce1e53d174b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

usb: musb: core: always try to recover from babble

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@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 3916e73abf7d..a48b5a9c6c47 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));