From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_2 autolearn=ham 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 4CCD5C2B9F7 for ; Mon, 24 May 2021 22:48:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E8E1861415 for ; Mon, 24 May 2021 22:48:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E8E1861415 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:CC:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=k4+yMDi26DWKoFlgO+0HDbAdlUZ6wVFlERB1mnyCCqk=; b=tXjOuggIsHsb8B HMhslX7KwpQsE9k5N2yZEAAq/cCYAubvQ2Nr2rBvUR73Ld2XtsRlkJjckzbezkpUmyyY1QRQAaJhO xX2l/ohw6muTJspmw6tQFvdvu8Uop1rpA31MQtUv/ar0euJMEU70qXYadaLV8HnbzlOisjqWBBaN6 KJjdPbhkorgR/YUeDBTuDOiV7amIgB9tVXCiC/WeQobAonvzbciL7PnF1HI+QZCeASpG2QvM300RG 6MU6kVsJgThOTnUUMk+egjmYJkR7Cqxgx+vQNKsx3tsoAgEkfpx9jQGYlqbntwxGS6os4YTbax26S Ly/fsxbtVYt4Tis31UGw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llJN8-002Cfm-Gu; Mon, 24 May 2021 22:48:30 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ll3VV-000hnS-V5; Mon, 24 May 2021 05:52:12 +0000 X-UUID: 16218f24262f4b5da32cfbc2910ccb09-20210523 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=LoLYf3k09hMICHMVpZro5qOWWXrtd+kOMaHi5n1SgPc=; b=KBEzU4Fbs6sGymUviRZ4SquZ/0bt/AlFB38yjPcEpC1Xvc5q77z0Z3Utp1lbg0VbRFaphSvS6EOex+BNl/DEIT6cft+PSTrRLrCPe3eDrTFS/H1vAVsp21yvz+1zt9cmT2TFnLg+9sCN0zioSUbMYJR0NQ10L5t78ycTA6Baoa4=; X-UUID: 16218f24262f4b5da32cfbc2910ccb09-20210523 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1494250670; Sun, 23 May 2021 22:51:57 -0700 Received: from MTKMBS32N1.mediatek.inc (172.27.4.71) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 23 May 2021 22:51:55 -0700 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS32N1.mediatek.inc (172.27.4.71) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 24 May 2021 13:51:51 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 24 May 2021 13:51:51 +0800 Message-ID: <1621835511.26501.14.camel@mhfsdcap03> Subject: Re: [PATCH v2 3/3] Revert "usb: common: usb-conn-gpio: Make VBUS supply optional" From: Chunfeng Yun To: Thierry Reding CC: Greg Kroah-Hartman , Liam Girdwood , Mark Brown , Matthias Brugger , Paul Cercueil , Lee Jones , , , , Date: Mon, 24 May 2021 13:51:51 +0800 In-Reply-To: References: <1621406386-18838-1-git-send-email-chunfeng.yun@mediatek.com> <1621406386-18838-3-git-send-email-chunfeng.yun@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 09521C55F9BDC52149C658731C51578E10BA171E1C2E2D51E277A9BE9C943C162000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210523_225209_924550_A5B7F16F X-CRM114-Status: GOOD ( 43.97 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Fri, 2021-05-21 at 15:20 +0200, Thierry Reding wrote: > On Wed, May 19, 2021 at 02:39:46PM +0800, Chunfeng Yun wrote: > > Vbus is already an optional supply, if the vbus-supply is not > > provided in DTS, will use a dummy regulator, > > That statement is not entirely correct. The dummy regulator is > substituted only if the supply is in fact not optional. The idea behind > that is to allow DTS files that don't specify all required regulators to > get away with it, based on the assumption that the supply is one of > those always-on supplies that are often not described in DTS. Yes, you are right. But from the point of result, it indeed can help to handle the absent regulator. > > > the warning log is as below: > > "supply vbus not found, using dummy regulator" > > And the reason why we get that warning is to point out that the DTS has > a bug and that it should be fixed (by adding a proper regulator to take > the place of the dummy). > > > This reverts commit 4ddf1ac79e5f082451cd549283d2eb7559ab6ca9. > > But if you read the description of that commit, the purpose of that > patch was in fact to make the supply completely optional in the case > where we already have the VBUS supply specified for the USB port that > the connector is parented to. Could you please give an example you mentioned? It seems prefer to provide vbus supply in connector instead of port according to dt-binding Thanks > > So in that case the DTS doesn't have the bug because the VBUS supply is > already specified for the USB port and therefore it doesn't have to be > specified in the USB connector again. In fact, specifying it twice can > lead to a situation where the USB port may not be able to switch the > VBUS supply on or off because the setting might conflict with that of > the USB connector. > > So unless there's a real reason why this is needed, I don't think this > should be applied. > > Thierry > > > Cc: Thierry Reding > > Signed-off-by: Chunfeng Yun > > --- > > v2: remove unused variable "need_vbus" > > --- > > drivers/usb/common/usb-conn-gpio.c | 30 ++++++------------------------ > > 1 file changed, 6 insertions(+), 24 deletions(-) > > > > diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c > > index dfbbc4f51ed6..65d89140cd19 100644 > > --- a/drivers/usb/common/usb-conn-gpio.c > > +++ b/drivers/usb/common/usb-conn-gpio.c > > @@ -91,14 +91,14 @@ static void usb_conn_detect_cable(struct work_struct *work) > > return; > > } > > > > - if (info->last_role == USB_ROLE_HOST && info->vbus) > > + if (info->last_role == USB_ROLE_HOST) > > regulator_disable(info->vbus); > > > > ret = usb_role_switch_set_role(info->role_sw, role); > > if (ret) > > dev_err(info->dev, "failed to set role: %d\n", ret); > > > > - if (role == USB_ROLE_HOST && info->vbus) { > > + if (role == USB_ROLE_HOST) { > > ret = regulator_enable(info->vbus); > > if (ret) > > dev_err(info->dev, "enable vbus regulator failed\n"); > > @@ -106,9 +106,8 @@ static void usb_conn_detect_cable(struct work_struct *work) > > > > info->last_role = role; > > > > - if (info->vbus) > > - dev_dbg(info->dev, "vbus regulator is %s\n", > > - regulator_is_enabled(info->vbus) ? "enabled" : "disabled"); > > + dev_dbg(info->dev, "vbus regulator is %s\n", > > + regulator_is_enabled(info->vbus) ? "enabled" : "disabled"); > > > > power_supply_changed(info->charger); > > } > > @@ -175,7 +174,6 @@ static int usb_conn_probe(struct platform_device *pdev) > > { > > struct device *dev = &pdev->dev; > > struct usb_conn_info *info; > > - bool need_vbus = true; > > int ret = 0; > > > > info = devm_kzalloc(dev, sizeof(*info), GFP_KERNEL); > > @@ -205,23 +203,7 @@ static int usb_conn_probe(struct platform_device *pdev) > > > > INIT_DELAYED_WORK(&info->dw_det, usb_conn_detect_cable); > > > > - /* > > - * If the USB connector is a child of a USB port and that port already provides the VBUS > > - * supply, there's no need for the USB connector to provide it again. > > - */ > > - if (dev->parent && dev->parent->of_node) { > > - if (of_find_property(dev->parent->of_node, "vbus-supply", NULL)) > > - need_vbus = false; > > - } > > - > > - if (!need_vbus) { > > - info->vbus = devm_regulator_get_optional(dev, "vbus"); > > - if (PTR_ERR(info->vbus) == -ENODEV) > > - info->vbus = NULL; > > - } else { > > - info->vbus = devm_regulator_get(dev, "vbus"); > > - } > > - > > + info->vbus = devm_regulator_get(dev, "vbus"); > > if (IS_ERR(info->vbus)) { > > ret = PTR_ERR(info->vbus); > > return dev_err_probe(dev, ret, "failed to get vbus :%d\n", ret); > > @@ -288,7 +270,7 @@ static int usb_conn_remove(struct platform_device *pdev) > > > > cancel_delayed_work_sync(&info->dw_det); > > > > - if (info->last_role == USB_ROLE_HOST && info->vbus) > > + if (info->last_role == USB_ROLE_HOST) > > regulator_disable(info->vbus); > > > > usb_role_switch_put(info->role_sw); > > -- > > 2.18.0 > > _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 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=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_2 autolearn=ham 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 90D02C04FF3 for ; Mon, 24 May 2021 05:52:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 63F9361151 for ; Mon, 24 May 2021 05:52:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232249AbhEXFx1 (ORCPT ); Mon, 24 May 2021 01:53:27 -0400 Received: from Mailgw01.mediatek.com ([1.203.163.78]:61931 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S229733AbhEXFx1 (ORCPT ); Mon, 24 May 2021 01:53:27 -0400 X-UUID: 0033122a9e304276a05e2d4759f66f7f-20210524 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=LoLYf3k09hMICHMVpZro5qOWWXrtd+kOMaHi5n1SgPc=; b=KBEzU4Fbs6sGymUviRZ4SquZ/0bt/AlFB38yjPcEpC1Xvc5q77z0Z3Utp1lbg0VbRFaphSvS6EOex+BNl/DEIT6cft+PSTrRLrCPe3eDrTFS/H1vAVsp21yvz+1zt9cmT2TFnLg+9sCN0zioSUbMYJR0NQ10L5t78ycTA6Baoa4=; X-UUID: 0033122a9e304276a05e2d4759f66f7f-20210524 Received: from mtkcas34.mediatek.inc [(172.27.4.253)] by mailgw01.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1031345565; Mon, 24 May 2021 13:51:54 +0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS32N1.mediatek.inc (172.27.4.71) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 24 May 2021 13:51:51 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 24 May 2021 13:51:51 +0800 Message-ID: <1621835511.26501.14.camel@mhfsdcap03> Subject: Re: [PATCH v2 3/3] Revert "usb: common: usb-conn-gpio: Make VBUS supply optional" From: Chunfeng Yun To: Thierry Reding CC: Greg Kroah-Hartman , Liam Girdwood , Mark Brown , Matthias Brugger , Paul Cercueil , Lee Jones , , , , Date: Mon, 24 May 2021 13:51:51 +0800 In-Reply-To: References: <1621406386-18838-1-git-send-email-chunfeng.yun@mediatek.com> <1621406386-18838-3-git-send-email-chunfeng.yun@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 09521C55F9BDC52149C658731C51578E10BA171E1C2E2D51E277A9BE9C943C162000:8 X-MTK: N Content-Transfer-Encoding: base64 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org T24gRnJpLCAyMDIxLTA1LTIxIGF0IDE1OjIwICswMjAwLCBUaGllcnJ5IFJlZGluZyB3cm90ZToN Cj4gT24gV2VkLCBNYXkgMTksIDIwMjEgYXQgMDI6Mzk6NDZQTSArMDgwMCwgQ2h1bmZlbmcgWXVu IHdyb3RlOg0KPiA+IFZidXMgaXMgYWxyZWFkeSBhbiBvcHRpb25hbCBzdXBwbHksIGlmIHRoZSB2 YnVzLXN1cHBseSBpcyBub3QNCj4gPiBwcm92aWRlZCBpbiBEVFMsIHdpbGwgdXNlIGEgZHVtbXkg cmVndWxhdG9yLA0KPiANCj4gVGhhdCBzdGF0ZW1lbnQgaXMgbm90IGVudGlyZWx5IGNvcnJlY3Qu IFRoZSBkdW1teSByZWd1bGF0b3IgaXMNCj4gc3Vic3RpdHV0ZWQgb25seSBpZiB0aGUgc3VwcGx5 IGlzIGluIGZhY3Qgbm90IG9wdGlvbmFsLiBUaGUgaWRlYSBiZWhpbmQNCj4gdGhhdCBpcyB0byBh bGxvdyBEVFMgZmlsZXMgdGhhdCBkb24ndCBzcGVjaWZ5IGFsbCByZXF1aXJlZCByZWd1bGF0b3Jz IHRvDQo+IGdldCBhd2F5IHdpdGggaXQsIGJhc2VkIG9uIHRoZSBhc3N1bXB0aW9uIHRoYXQgdGhl IHN1cHBseSBpcyBvbmUgb2YNCj4gdGhvc2UgYWx3YXlzLW9uIHN1cHBsaWVzIHRoYXQgYXJlIG9m dGVuIG5vdCBkZXNjcmliZWQgaW4gRFRTLg0KWWVzLCB5b3UgYXJlIHJpZ2h0Lg0KQnV0IGZyb20g dGhlIHBvaW50IG9mIHJlc3VsdCwgaXQgaW5kZWVkIGNhbiBoZWxwIHRvIGhhbmRsZSB0aGUgYWJz ZW50DQpyZWd1bGF0b3IuDQo+IA0KPiA+IHRoZSB3YXJuaW5nIGxvZyBpcyBhcyBiZWxvdzoNCj4g PiAic3VwcGx5IHZidXMgbm90IGZvdW5kLCB1c2luZyBkdW1teSByZWd1bGF0b3IiDQo+IA0KPiBB bmQgdGhlIHJlYXNvbiB3aHkgd2UgZ2V0IHRoYXQgd2FybmluZyBpcyB0byBwb2ludCBvdXQgdGhh dCB0aGUgRFRTIGhhcw0KPiBhIGJ1ZyBhbmQgdGhhdCBpdCBzaG91bGQgYmUgZml4ZWQgKGJ5IGFk ZGluZyBhIHByb3BlciByZWd1bGF0b3IgdG8gdGFrZQ0KPiB0aGUgcGxhY2Ugb2YgdGhlIGR1bW15 KS4NCj4gDQo+ID4gVGhpcyByZXZlcnRzIGNvbW1pdCA0ZGRmMWFjNzllNWYwODI0NTFjZDU0OTI4 M2QyZWI3NTU5YWI2Y2E5Lg0KPiANCj4gQnV0IGlmIHlvdSByZWFkIHRoZSBkZXNjcmlwdGlvbiBv ZiB0aGF0IGNvbW1pdCwgdGhlIHB1cnBvc2Ugb2YgdGhhdA0KPiBwYXRjaCB3YXMgaW4gZmFjdCB0 byBtYWtlIHRoZSBzdXBwbHkgY29tcGxldGVseSBvcHRpb25hbCBpbiB0aGUgY2FzZQ0KPiB3aGVy ZSB3ZSBhbHJlYWR5IGhhdmUgdGhlIFZCVVMgc3VwcGx5IHNwZWNpZmllZCBmb3IgdGhlIFVTQiBw b3J0IHRoYXQNCj4gdGhlIGNvbm5lY3RvciBpcyBwYXJlbnRlZCB0by4NCkNvdWxkIHlvdSBwbGVh c2UgZ2l2ZSBhbiBleGFtcGxlIHlvdSBtZW50aW9uZWQ/DQoNCkl0IHNlZW1zIHByZWZlciB0byBw cm92aWRlIHZidXMgc3VwcGx5IGluIGNvbm5lY3RvciBpbnN0ZWFkIG9mIHBvcnQNCmFjY29yZGlu ZyB0byBkdC1iaW5kaW5nDQoNClRoYW5rcw0KDQo+IA0KPiBTbyBpbiB0aGF0IGNhc2UgdGhlIERU UyBkb2Vzbid0IGhhdmUgdGhlIGJ1ZyBiZWNhdXNlIHRoZSBWQlVTIHN1cHBseSBpcw0KPiBhbHJl YWR5IHNwZWNpZmllZCBmb3IgdGhlIFVTQiBwb3J0IGFuZCB0aGVyZWZvcmUgaXQgZG9lc24ndCBo YXZlIHRvIGJlDQo+IHNwZWNpZmllZCBpbiB0aGUgVVNCIGNvbm5lY3RvciBhZ2Fpbi4gSW4gZmFj dCwgc3BlY2lmeWluZyBpdCB0d2ljZSBjYW4NCj4gbGVhZCB0byBhIHNpdHVhdGlvbiB3aGVyZSB0 aGUgVVNCIHBvcnQgbWF5IG5vdCBiZSBhYmxlIHRvIHN3aXRjaCB0aGUNCj4gVkJVUyBzdXBwbHkg b24gb3Igb2ZmIGJlY2F1c2UgdGhlIHNldHRpbmcgbWlnaHQgY29uZmxpY3Qgd2l0aCB0aGF0IG9m DQo+IHRoZSBVU0IgY29ubmVjdG9yLg0KDQo+IA0KPiBTbyB1bmxlc3MgdGhlcmUncyBhIHJlYWwg cmVhc29uIHdoeSB0aGlzIGlzIG5lZWRlZCwgSSBkb24ndCB0aGluayB0aGlzDQo+IHNob3VsZCBi ZSBhcHBsaWVkLg0KPiANCj4gVGhpZXJyeQ0KPiANCj4gPiBDYzogVGhpZXJyeSBSZWRpbmcgPHRy ZWRpbmdAbnZpZGlhLmNvbT4NCj4gPiBTaWduZWQtb2ZmLWJ5OiBDaHVuZmVuZyBZdW4gPGNodW5m ZW5nLnl1bkBtZWRpYXRlay5jb20+DQo+ID4gLS0tDQo+ID4gdjI6IHJlbW92ZSB1bnVzZWQgdmFy aWFibGUgIm5lZWRfdmJ1cyINCj4gPiAtLS0NCj4gPiAgZHJpdmVycy91c2IvY29tbW9uL3VzYi1j b25uLWdwaW8uYyB8IDMwICsrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KPiA+ICAxIGZp bGUgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkNCj4gPiANCj4gPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvY29tbW9uL3VzYi1jb25uLWdwaW8uYyBiL2RyaXZlcnMv dXNiL2NvbW1vbi91c2ItY29ubi1ncGlvLmMNCj4gPiBpbmRleCBkZmJiYzRmNTFlZDYuLjY1ZDg5 MTQwY2QxOSAxMDA2NDQNCj4gPiAtLS0gYS9kcml2ZXJzL3VzYi9jb21tb24vdXNiLWNvbm4tZ3Bp by5jDQo+ID4gKysrIGIvZHJpdmVycy91c2IvY29tbW9uL3VzYi1jb25uLWdwaW8uYw0KPiA+IEBA IC05MSwxNCArOTEsMTQgQEAgc3RhdGljIHZvaWQgdXNiX2Nvbm5fZGV0ZWN0X2NhYmxlKHN0cnVj dCB3b3JrX3N0cnVjdCAqd29yaykNCj4gPiAgCQlyZXR1cm47DQo+ID4gIAl9DQo+ID4gIA0KPiA+ IC0JaWYgKGluZm8tPmxhc3Rfcm9sZSA9PSBVU0JfUk9MRV9IT1NUICYmIGluZm8tPnZidXMpDQo+ ID4gKwlpZiAoaW5mby0+bGFzdF9yb2xlID09IFVTQl9ST0xFX0hPU1QpDQo+ID4gIAkJcmVndWxh dG9yX2Rpc2FibGUoaW5mby0+dmJ1cyk7DQo+ID4gIA0KPiA+ICAJcmV0ID0gdXNiX3JvbGVfc3dp dGNoX3NldF9yb2xlKGluZm8tPnJvbGVfc3csIHJvbGUpOw0KPiA+ICAJaWYgKHJldCkNCj4gPiAg CQlkZXZfZXJyKGluZm8tPmRldiwgImZhaWxlZCB0byBzZXQgcm9sZTogJWRcbiIsIHJldCk7DQo+ ID4gIA0KPiA+IC0JaWYgKHJvbGUgPT0gVVNCX1JPTEVfSE9TVCAmJiBpbmZvLT52YnVzKSB7DQo+ ID4gKwlpZiAocm9sZSA9PSBVU0JfUk9MRV9IT1NUKSB7DQo+ID4gIAkJcmV0ID0gcmVndWxhdG9y X2VuYWJsZShpbmZvLT52YnVzKTsNCj4gPiAgCQlpZiAocmV0KQ0KPiA+ICAJCQlkZXZfZXJyKGlu Zm8tPmRldiwgImVuYWJsZSB2YnVzIHJlZ3VsYXRvciBmYWlsZWRcbiIpOw0KPiA+IEBAIC0xMDYs OSArMTA2LDggQEAgc3RhdGljIHZvaWQgdXNiX2Nvbm5fZGV0ZWN0X2NhYmxlKHN0cnVjdCB3b3Jr X3N0cnVjdCAqd29yaykNCj4gPiAgDQo+ID4gIAlpbmZvLT5sYXN0X3JvbGUgPSByb2xlOw0KPiA+ ICANCj4gPiAtCWlmIChpbmZvLT52YnVzKQ0KPiA+IC0JCWRldl9kYmcoaW5mby0+ZGV2LCAidmJ1 cyByZWd1bGF0b3IgaXMgJXNcbiIsDQo+ID4gLQkJCXJlZ3VsYXRvcl9pc19lbmFibGVkKGluZm8t PnZidXMpID8gImVuYWJsZWQiIDogImRpc2FibGVkIik7DQo+ID4gKwlkZXZfZGJnKGluZm8tPmRl diwgInZidXMgcmVndWxhdG9yIGlzICVzXG4iLA0KPiA+ICsJCXJlZ3VsYXRvcl9pc19lbmFibGVk KGluZm8tPnZidXMpID8gImVuYWJsZWQiIDogImRpc2FibGVkIik7DQo+ID4gIA0KPiA+ICAJcG93 ZXJfc3VwcGx5X2NoYW5nZWQoaW5mby0+Y2hhcmdlcik7DQo+ID4gIH0NCj4gPiBAQCAtMTc1LDcg KzE3NCw2IEBAIHN0YXRpYyBpbnQgdXNiX2Nvbm5fcHJvYmUoc3RydWN0IHBsYXRmb3JtX2Rldmlj ZSAqcGRldikNCj4gPiAgew0KPiA+ICAJc3RydWN0IGRldmljZSAqZGV2ID0gJnBkZXYtPmRldjsN Cj4gPiAgCXN0cnVjdCB1c2JfY29ubl9pbmZvICppbmZvOw0KPiA+IC0JYm9vbCBuZWVkX3ZidXMg PSB0cnVlOw0KPiA+ICAJaW50IHJldCA9IDA7DQo+ID4gIA0KPiA+ICAJaW5mbyA9IGRldm1fa3ph bGxvYyhkZXYsIHNpemVvZigqaW5mbyksIEdGUF9LRVJORUwpOw0KPiA+IEBAIC0yMDUsMjMgKzIw Myw3IEBAIHN0YXRpYyBpbnQgdXNiX2Nvbm5fcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAq cGRldikNCj4gPiAgDQo+ID4gIAlJTklUX0RFTEFZRURfV09SSygmaW5mby0+ZHdfZGV0LCB1c2Jf Y29ubl9kZXRlY3RfY2FibGUpOw0KPiA+ICANCj4gPiAtCS8qDQo+ID4gLQkgKiBJZiB0aGUgVVNC IGNvbm5lY3RvciBpcyBhIGNoaWxkIG9mIGEgVVNCIHBvcnQgYW5kIHRoYXQgcG9ydCBhbHJlYWR5 IHByb3ZpZGVzIHRoZSBWQlVTDQo+ID4gLQkgKiBzdXBwbHksIHRoZXJlJ3Mgbm8gbmVlZCBmb3Ig dGhlIFVTQiBjb25uZWN0b3IgdG8gcHJvdmlkZSBpdCBhZ2Fpbi4NCj4gPiAtCSAqLw0KPiA+IC0J aWYgKGRldi0+cGFyZW50ICYmIGRldi0+cGFyZW50LT5vZl9ub2RlKSB7DQo+ID4gLQkJaWYgKG9m X2ZpbmRfcHJvcGVydHkoZGV2LT5wYXJlbnQtPm9mX25vZGUsICJ2YnVzLXN1cHBseSIsIE5VTEwp KQ0KPiA+IC0JCQluZWVkX3ZidXMgPSBmYWxzZTsNCj4gPiAtCX0NCj4gPiAtDQo+ID4gLQlpZiAo IW5lZWRfdmJ1cykgew0KPiA+IC0JCWluZm8tPnZidXMgPSBkZXZtX3JlZ3VsYXRvcl9nZXRfb3B0 aW9uYWwoZGV2LCAidmJ1cyIpOw0KPiA+IC0JCWlmIChQVFJfRVJSKGluZm8tPnZidXMpID09IC1F Tk9ERVYpDQo+ID4gLQkJCWluZm8tPnZidXMgPSBOVUxMOw0KPiA+IC0JfSBlbHNlIHsNCj4gPiAt CQlpbmZvLT52YnVzID0gZGV2bV9yZWd1bGF0b3JfZ2V0KGRldiwgInZidXMiKTsNCj4gPiAtCX0N Cj4gPiAtDQo+ID4gKwlpbmZvLT52YnVzID0gZGV2bV9yZWd1bGF0b3JfZ2V0KGRldiwgInZidXMi KTsNCj4gPiAgCWlmIChJU19FUlIoaW5mby0+dmJ1cykpIHsNCj4gPiAgCQlyZXQgPSBQVFJfRVJS KGluZm8tPnZidXMpOw0KPiA+ICAJCXJldHVybiBkZXZfZXJyX3Byb2JlKGRldiwgcmV0LCAiZmFp bGVkIHRvIGdldCB2YnVzIDolZFxuIiwgcmV0KTsNCj4gPiBAQCAtMjg4LDcgKzI3MCw3IEBAIHN0 YXRpYyBpbnQgdXNiX2Nvbm5fcmVtb3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpDQo+ ID4gIA0KPiA+ICAJY2FuY2VsX2RlbGF5ZWRfd29ya19zeW5jKCZpbmZvLT5kd19kZXQpOw0KPiA+ ICANCj4gPiAtCWlmIChpbmZvLT5sYXN0X3JvbGUgPT0gVVNCX1JPTEVfSE9TVCAmJiBpbmZvLT52 YnVzKQ0KPiA+ICsJaWYgKGluZm8tPmxhc3Rfcm9sZSA9PSBVU0JfUk9MRV9IT1NUKQ0KPiA+ICAJ CXJlZ3VsYXRvcl9kaXNhYmxlKGluZm8tPnZidXMpOw0KPiA+ICANCj4gPiAgCXVzYl9yb2xlX3N3 aXRjaF9wdXQoaW5mby0+cm9sZV9zdyk7DQo+ID4gLS0gDQo+ID4gMi4xOC4wDQo+ID4gDQoNCg== From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_2 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 291DFC2B9F7 for ; Mon, 24 May 2021 22:51:19 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E259761414 for ; Mon, 24 May 2021 22:51:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E259761414 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:CC:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YFyiGkr0SqS34vgwmNpciWOkRz7BHeflXZroOqmwAWI=; b=yz1O5KyQ+73PZc Lb170jZqkjlsBaYHD45w4/2/QtlwNoR7ntvPCKxWJHx2q2LmOt34etoaOZbOiyNdafsvRfbOfB3oO TRr23MLD8xWvFPpkeesw/UqQ6DKGZAVSLhhVoRuWeX3W0LBELujRmg2BvaqZXMsJgil6Adz8MpNyn nFlShs/zMYi8SY9yZTao69tGu6vADvHvqvJNlk+qOVx1lZBHWkjDnRfFLhj6FwsNv5PAqBAbrJ+gW me6U1sKhKW2nHXdykqSZtEjUFQL1NEmxAkljwlMWL2LxE0JiN540YFXjRPPgfvX9wZ1ZhIOW2SQvQ +XL+BWk7R6CVtNOX20KQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1llJNM-002Chl-QC; Mon, 24 May 2021 22:48:46 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ll3VV-000hnS-V5; Mon, 24 May 2021 05:52:12 +0000 X-UUID: 16218f24262f4b5da32cfbc2910ccb09-20210523 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=LoLYf3k09hMICHMVpZro5qOWWXrtd+kOMaHi5n1SgPc=; b=KBEzU4Fbs6sGymUviRZ4SquZ/0bt/AlFB38yjPcEpC1Xvc5q77z0Z3Utp1lbg0VbRFaphSvS6EOex+BNl/DEIT6cft+PSTrRLrCPe3eDrTFS/H1vAVsp21yvz+1zt9cmT2TFnLg+9sCN0zioSUbMYJR0NQ10L5t78ycTA6Baoa4=; X-UUID: 16218f24262f4b5da32cfbc2910ccb09-20210523 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1494250670; Sun, 23 May 2021 22:51:57 -0700 Received: from MTKMBS32N1.mediatek.inc (172.27.4.71) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 23 May 2021 22:51:55 -0700 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS32N1.mediatek.inc (172.27.4.71) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 24 May 2021 13:51:51 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 24 May 2021 13:51:51 +0800 Message-ID: <1621835511.26501.14.camel@mhfsdcap03> Subject: Re: [PATCH v2 3/3] Revert "usb: common: usb-conn-gpio: Make VBUS supply optional" From: Chunfeng Yun To: Thierry Reding CC: Greg Kroah-Hartman , Liam Girdwood , Mark Brown , Matthias Brugger , Paul Cercueil , Lee Jones , , , , Date: Mon, 24 May 2021 13:51:51 +0800 In-Reply-To: References: <1621406386-18838-1-git-send-email-chunfeng.yun@mediatek.com> <1621406386-18838-3-git-send-email-chunfeng.yun@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 09521C55F9BDC52149C658731C51578E10BA171E1C2E2D51E277A9BE9C943C162000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210523_225209_924550_A5B7F16F X-CRM114-Status: GOOD ( 43.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, 2021-05-21 at 15:20 +0200, Thierry Reding wrote: > On Wed, May 19, 2021 at 02:39:46PM +0800, Chunfeng Yun wrote: > > Vbus is already an optional supply, if the vbus-supply is not > > provided in DTS, will use a dummy regulator, > > That statement is not entirely correct. The dummy regulator is > substituted only if the supply is in fact not optional. The idea behind > that is to allow DTS files that don't specify all required regulators to > get away with it, based on the assumption that the supply is one of > those always-on supplies that are often not described in DTS. Yes, you are right. But from the point of result, it indeed can help to handle the absent regulator. > > > the warning log is as below: > > "supply vbus not found, using dummy regulator" > > And the reason why we get that warning is to point out that the DTS has > a bug and that it should be fixed (by adding a proper regulator to take > the place of the dummy). > > > This reverts commit 4ddf1ac79e5f082451cd549283d2eb7559ab6ca9. > > But if you read the description of that commit, the purpose of that > patch was in fact to make the supply completely optional in the case > where we already have the VBUS supply specified for the USB port that > the connector is parented to. Could you please give an example you mentioned? It seems prefer to provide vbus supply in connector instead of port according to dt-binding Thanks > > So in that case the DTS doesn't have the bug because the VBUS supply is > already specified for the USB port and therefore it doesn't have to be > specified in the USB connector again. In fact, specifying it twice can > lead to a situation where the USB port may not be able to switch the > VBUS supply on or off because the setting might conflict with that of > the USB connector. > > So unless there's a real reason why this is needed, I don't think this > should be applied. > > Thierry > > > Cc: Thierry Reding > > Signed-off-by: Chunfeng Yun > > --- > > v2: remove unused variable "need_vbus" > > --- > > drivers/usb/common/usb-conn-gpio.c | 30 ++++++------------------------ > > 1 file changed, 6 insertions(+), 24 deletions(-) > > > > diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c > > index dfbbc4f51ed6..65d89140cd19 100644 > > --- a/drivers/usb/common/usb-conn-gpio.c > > +++ b/drivers/usb/common/usb-conn-gpio.c > > @@ -91,14 +91,14 @@ static void usb_conn_detect_cable(struct work_struct *work) > > return; > > } > > > > - if (info->last_role == USB_ROLE_HOST && info->vbus) > > + if (info->last_role == USB_ROLE_HOST) > > regulator_disable(info->vbus); > > > > ret = usb_role_switch_set_role(info->role_sw, role); > > if (ret) > > dev_err(info->dev, "failed to set role: %d\n", ret); > > > > - if (role == USB_ROLE_HOST && info->vbus) { > > + if (role == USB_ROLE_HOST) { > > ret = regulator_enable(info->vbus); > > if (ret) > > dev_err(info->dev, "enable vbus regulator failed\n"); > > @@ -106,9 +106,8 @@ static void usb_conn_detect_cable(struct work_struct *work) > > > > info->last_role = role; > > > > - if (info->vbus) > > - dev_dbg(info->dev, "vbus regulator is %s\n", > > - regulator_is_enabled(info->vbus) ? "enabled" : "disabled"); > > + dev_dbg(info->dev, "vbus regulator is %s\n", > > + regulator_is_enabled(info->vbus) ? "enabled" : "disabled"); > > > > power_supply_changed(info->charger); > > } > > @@ -175,7 +174,6 @@ static int usb_conn_probe(struct platform_device *pdev) > > { > > struct device *dev = &pdev->dev; > > struct usb_conn_info *info; > > - bool need_vbus = true; > > int ret = 0; > > > > info = devm_kzalloc(dev, sizeof(*info), GFP_KERNEL); > > @@ -205,23 +203,7 @@ static int usb_conn_probe(struct platform_device *pdev) > > > > INIT_DELAYED_WORK(&info->dw_det, usb_conn_detect_cable); > > > > - /* > > - * If the USB connector is a child of a USB port and that port already provides the VBUS > > - * supply, there's no need for the USB connector to provide it again. > > - */ > > - if (dev->parent && dev->parent->of_node) { > > - if (of_find_property(dev->parent->of_node, "vbus-supply", NULL)) > > - need_vbus = false; > > - } > > - > > - if (!need_vbus) { > > - info->vbus = devm_regulator_get_optional(dev, "vbus"); > > - if (PTR_ERR(info->vbus) == -ENODEV) > > - info->vbus = NULL; > > - } else { > > - info->vbus = devm_regulator_get(dev, "vbus"); > > - } > > - > > + info->vbus = devm_regulator_get(dev, "vbus"); > > if (IS_ERR(info->vbus)) { > > ret = PTR_ERR(info->vbus); > > return dev_err_probe(dev, ret, "failed to get vbus :%d\n", ret); > > @@ -288,7 +270,7 @@ static int usb_conn_remove(struct platform_device *pdev) > > > > cancel_delayed_work_sync(&info->dw_det); > > > > - if (info->last_role == USB_ROLE_HOST && info->vbus) > > + if (info->last_role == USB_ROLE_HOST) > > regulator_disable(info->vbus); > > > > usb_role_switch_put(info->role_sw); > > -- > > 2.18.0 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel