Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760583AbcCDWys (ORCPT ); Fri, 4 Mar 2016 17:54:48 -0500 Received: from sender163-mail.zoho.com ([74.201.84.163]:25658 "EHLO sender163-mail.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760434AbcCDWyq convert rfc822-to-8bit (ORCPT ); Fri, 4 Mar 2016 17:54:46 -0500 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: [RFT PATCH 2/2] Revert "usb: dwc2: Fix probe problem on bcm2835" From: Michael Niewoehner In-Reply-To: <1457115786-11370-2-git-send-email-dianders@chromium.org> Date: Fri, 4 Mar 2016 23:54:33 +0100 Cc: johnyoun@synopsys.com, balbi@kernel.org, Heiko Stuebner , caesar.upstream@gmail.com, huangtao@rock-chips.com, repk@triplefau.lt, stefan.wahren@i2se.com, Julius Werner , gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8BIT Message-Id: <6B9FC71B-CA68-458E-B21D-677E8E2F5D91@mniewoehner.de> References: <1457115786-11370-1-git-send-email-dianders@chromium.org> <1457115786-11370-2-git-send-email-dianders@chromium.org> To: Douglas Anderson X-Mailer: Apple Mail (2.1878.6) X-Zoho-Virus-Status: 2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1122 Lines: 35 Am 04.03.2016 um 19:23 schrieb Douglas Anderson : > This reverts commit 192cb07f7928 ("usb: dwc2: Fix probe problem on > bcm2835") now that we've found the root cause. See the change > titled ("usb: dwc2: Add a 10 ms delay to dwc2_core_reset()"). > > Signed-off-by: Douglas Anderson Tested-by: Michael Niewoehner > --- > drivers/usb/dwc2/core.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c > index 8710b2d3e770..7c4a6cf4c73a 100644 > --- a/drivers/usb/dwc2/core.c > +++ b/drivers/usb/dwc2/core.c > @@ -353,6 +353,12 @@ static bool dwc2_force_mode(struct dwc2_hsotg *hsotg, bool host) > set = host ? GUSBCFG_FORCEHOSTMODE : GUSBCFG_FORCEDEVMODE; > clear = host ? GUSBCFG_FORCEDEVMODE : GUSBCFG_FORCEHOSTMODE; > > + /* > + * If the force mode bit is already set, don't set it. > + */ > + if ((gusbcfg & set) && !(gusbcfg & clear)) > + return false; > + > gusbcfg &= ~clear; > gusbcfg |= set; > dwc2_writel(gusbcfg, hsotg->regs + GUSBCFG); > -- > 2.7.0.rc3.207.g0ac5344 >