linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Douglas Anderson <dianders@chromium.org>
To: johnyoun@synopsys.com, balbi@kernel.org,
	Heiko Stuebner <heiko@sntech.de>
Cc: linux@mniewoehner.de, caesar.upstream@gmail.com,
	huangtao@rock-chips.com, repk@triplefau.lt,
	stefan.wahren@i2se.com, Julius Werner <jwerner@chromium.org>,
	Douglas Anderson <dianders@chromium.org>,
	gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [RFT PATCH 2/2] Revert "usb: dwc2: Fix probe problem on bcm2835"
Date: Fri,  4 Mar 2016 10:23:06 -0800	[thread overview]
Message-ID: <1457115786-11370-2-git-send-email-dianders@chromium.org> (raw)
In-Reply-To: <1457115786-11370-1-git-send-email-dianders@chromium.org>

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 <dianders@chromium.org>
---
 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

  reply	other threads:[~2016-03-04 18:23 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-04 18:23 [RFT PATCH 1/2] usb: dwc2: Add a 10 ms delay to dwc2_core_reset() Douglas Anderson
2016-03-04 18:23 ` Douglas Anderson [this message]
2016-03-04 22:54   ` [RFT PATCH 2/2] Revert "usb: dwc2: Fix probe problem on bcm2835" Michael Niewoehner
2016-03-07 18:40   ` Stefan Wahren
2016-03-07 21:30     ` Doug Anderson
2016-03-08 17:49       ` Stefan Wahren
2016-03-09 19:01       ` Stefan Wahren
2016-03-09 19:06         ` Doug Anderson
2016-03-10 19:14           ` John Youn
2016-03-16 18:28             ` John Youn
2016-03-18 23:14               ` Stefan Wahren
2016-03-19  2:17                 ` Eric Anholt
2016-03-19  7:44                   ` Martin Sperl
2016-03-19  9:52                     ` Stefan Wahren
2016-03-19 10:10                       ` Martin Sperl
2016-03-19 12:09                         ` Stefan Wahren
2016-03-19  9:45                   ` Stefan Wahren
2016-03-19  5:21               ` Doug Anderson
2016-03-22 19:26                 ` John Youn
2016-03-22 19:44                   ` Doug Anderson
2016-03-22 20:37                     ` John Youn
2016-03-24  6:18                     ` John Youn
2016-03-04 22:54 ` [RFT PATCH 1/2] usb: dwc2: Add a 10 ms delay to dwc2_core_reset() Michael Niewoehner
2016-03-05  0:09   ` Michael Niewoehner
2016-03-05  0:33     ` Doug Anderson
2016-03-05  1:09       ` Doug Anderson
2016-03-05 20:41       ` Michael Niewoehner
2016-03-06  1:38         ` Doug Anderson
2016-03-04 23:46 ` Karl Palsson
2016-03-05  0:36   ` Doug Anderson
2016-03-04 23:52 ` Sergei Shtylyov
2016-03-05  2:23 ` John Youn

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=1457115786-11370-2-git-send-email-dianders@chromium.org \
    --to=dianders@chromium.org \
    --cc=balbi@kernel.org \
    --cc=caesar.upstream@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=heiko@sntech.de \
    --cc=huangtao@rock-chips.com \
    --cc=johnyoun@synopsys.com \
    --cc=jwerner@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=linux@mniewoehner.de \
    --cc=repk@triplefau.lt \
    --cc=stefan.wahren@i2se.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).