From patchwork Fri Jul 15 09:13:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 72077 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp509956qga; Fri, 15 Jul 2016 02:14:54 -0700 (PDT) X-Received: by 10.98.131.8 with SMTP id h8mr19917478pfe.124.1468574088806; Fri, 15 Jul 2016 02:14:48 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t63si3175385pfa.44.2016.07.15.02.14.48; Fri, 15 Jul 2016 02:14:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932470AbcGOJOp (ORCPT + 29 others); Fri, 15 Jul 2016 05:14:45 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:34846 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932261AbcGOJOi (ORCPT ); Fri, 15 Jul 2016 05:14:38 -0400 Received: by mail-pa0-f48.google.com with SMTP id dx3so37921178pab.2 for ; Fri, 15 Jul 2016 02:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=u0/jUE3i9eeBxvVJMqMUyuhzz/QsJ+ttWFsCcAC/utQ=; b=ceFd2EGQhFpciZIwlE+41KzahjGqJLBH0vaMPZKiiYcaT5MeajH8aP90r0boSGru64 AB/L740Fpp4x3E8jQO6IUNP14dPSlYuHyuP4Kks6WABqD/jNU2uAo7ReRQoyWUqGp/yW hhozC88FhU6D/swAOlGryALAM4EqIlFeeIRLI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=u0/jUE3i9eeBxvVJMqMUyuhzz/QsJ+ttWFsCcAC/utQ=; b=CTTUfS1+UGh2dh76DfKciu4nhbZd3vpJY5uBfyhJnFWdXJMPmQki61EIL5HuZWZVkV UNQ+C0QshU061sUAgEVEA2tmo6wSAWrnw51TsCr/2ONEYfMye75jAvAbh0NaBPOKo0Y3 nX99IwF6+td0DlgQvyvvtqPoQXsiljbC5cq3rTZXfH9RCmzj0ZzWjNVjWgm5z0W8Ms8Y sAFDbIRbqKFADitdXt+Ri3aPwIBZBByPWvtP5LNXp8AT8j4isgLjL8aQQ8kwiH29iHNF o2WgvCN30gumlO8QaPtKFFIl1VFicpqSd+LGsQkvkKRR3ZGjNSSqtuijcRCzGY2Mttj9 E5CA== X-Gm-Message-State: ALyK8tLWiJ3shsMXcswNGmszUMgQzB8WH7WxlNvT5SMuNq2uh0pU363PE+2SpwxynrtPCrHu X-Received: by 10.66.145.1 with SMTP id sq1mr29965968pab.107.1468574077395; Fri, 15 Jul 2016 02:14:37 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id da2sm1820199pad.3.2016.07.15.02.14.34 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Jul 2016 02:14:37 -0700 (PDT) From: Baolin Wang To: balbi@kernel.org, gregkh@linuxfoundation.org Cc: mathias.nyman@intel.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, broonie@kernel.org, baolin.wang@linaro.org Subject: [PATCH 3/4] usb: dwc3: core: Move the mode setting to the right place Date: Fri, 15 Jul 2016 17:13:27 +0800 Message-Id: <17d90b25eaefb22d92f2f55a3fd750da8be368fc.1468571634.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When dwc3 core enters into suspend mode, the system (especially for mobile device) may power off the dwc3 controller for power saving, that will cause dwc3 controller lost the mode operation when resuming dwc3 core. Thus we can move the mode setting into dwc3_core_init() function to avoid this issue. Signed-off-by: Baolin Wang --- drivers/usb/dwc3/core.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) -- 1.7.9.5 diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 9466431..1485480 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -666,6 +666,21 @@ static int dwc3_core_init(struct dwc3 *dwc) goto err4; } + switch (dwc->dr_mode) { + case USB_DR_MODE_PERIPHERAL: + dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_DEVICE); + break; + case USB_DR_MODE_HOST: + dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_HOST); + break; + case USB_DR_MODE_OTG: + dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG); + break; + default: + dev_warn(dwc->dev, "Unsupported mode %d\n", dwc->dr_mode); + break; + } + return 0; err4: @@ -763,7 +778,6 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: - dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_DEVICE); ret = dwc3_gadget_init(dwc); if (ret) { if (ret != -EPROBE_DEFER) @@ -772,7 +786,6 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) } break; case USB_DR_MODE_HOST: - dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_HOST); ret = dwc3_host_init(dwc); if (ret) { if (ret != -EPROBE_DEFER) @@ -781,7 +794,6 @@ static int dwc3_core_init_mode(struct dwc3 *dwc) } break; case USB_DR_MODE_OTG: - dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG); ret = dwc3_host_init(dwc); if (ret) { if (ret != -EPROBE_DEFER)