From patchwork Mon Feb 3 16:19:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232252 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA53BC3524D for ; Mon, 3 Feb 2020 16:22:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B74032080D for ; Mon, 3 Feb 2020 16:22:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580746965; bh=Ng+xPgKDS+kdlTzojj6DGNvUJu4znB1zBFNtz6PAXvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=G7wrKAbh7Q6wBOZ9aiIWsToojBoEHipb5VkB/ZSY+FZZkXRpCW576DQkFTHjWJY7Q kLBktZAi14hf0ER6ol4aaNniN0PJWy3yziRvVSWAQYH3iiN8pWjKMC+Ys3KGRsubCF 2ewQpa3T2usi7WkcX7YBEBl5OWhGkgI68GwUhhaY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728991AbgBCQUx (ORCPT ); Mon, 3 Feb 2020 11:20:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:60862 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728984AbgBCQUw (ORCPT ); Mon, 3 Feb 2020 11:20:52 -0500 Received: from localhost (unknown [104.132.45.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B899A2082E; Mon, 3 Feb 2020 16:20:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580746852; bh=Ng+xPgKDS+kdlTzojj6DGNvUJu4znB1zBFNtz6PAXvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mPw5b9309C5S5Os4mUa1QVDd6xqhLSn+2T1f18sJELPJ6kX2IQyoHHVjSZT8RkBrz Gq1n7dLSdZL0QaDJm+UBk/anWHf+qpQIW4/avSCwfv6tbCRYQhAx+qcwKXMk52GFBI DBCt6Ww35Cn0AK9GYeGZXyBMP7S71Ia5f4bYKOX8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bin Liu , Felipe Balbi , Sasha Levin Subject: [PATCH 4.4 32/53] usb: dwc3: turn off VBUS when leaving host mode Date: Mon, 3 Feb 2020 16:19:24 +0000 Message-Id: <20200203161908.866733370@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200203161902.714326084@linuxfoundation.org> References: <20200203161902.714326084@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bin Liu [ Upstream commit 09ed259fac621634d51cd986aa8d65f035662658 ] VBUS should be turned off when leaving the host mode. Set GCTL_PRTCAP to device mode in teardown to de-assert DRVVBUS pin to turn off VBUS power. Fixes: 5f94adfeed97 ("usb: dwc3: core: refactor mode initialization to its own function") Cc: stable@vger.kernel.org Signed-off-by: Bin Liu Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/dwc3/core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 4378e758baef9..591bc3f7be763 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -801,6 +801,9 @@ static void dwc3_core_exit_mode(struct dwc3 *dwc) /* do nothing */ break; } + + /* de-assert DRVVBUS for HOST and OTG mode */ + dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_DEVICE); } #define DWC3_ALIGN_MASK (16 - 1)