From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2] usb: typec: get the vbus source and charge values from the devicetree From: Heikki Krogerus Message-Id: <20180910073529.GL25121@kuha.fi.intel.com> Date: Mon, 10 Sep 2018 10:35:29 +0300 To: "Angus Ainslie \(Purism\)" Cc: groeck7@gmail.com, Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: T24gU3VuLCBTZXAgMDksIDIwMTggYXQgMTI6MDU6MzFQTSAtMDYwMCwgQW5ndXMgQWluc2xpZSAo UHVyaXNtKSB3cm90ZToKPiBJZiB0aGUgYm9hcmQgaXMgYmVpbmcgcG93ZXJlZCBieSBVU0IgZGlz YWJsaW5nIHRoZSBzb3VyY2UgYW5kIHNpbmsKPiBjYW4gcmVtb3ZlIHBvd2VyIGZyb20gdGhlIGJv YXJkLiBBbGxvdyB0aGUgc291cmNlIGFuZCBzaW5rIHRvIGJlCj4gaW5pdGFsbGl6ZWQgYmFzZWQg b24gZGV2aWNldHJlZSB2YWx1ZXMuCj4gCj4gQ2hhbmdlZCBzaW5jZSBWMToKPiAKPiB1c2UgZGV2 aWNldHJlZSB2YWx1ZXMgaW5zdGVhZCBvZiBoYXJkY29kZWQgaW5pdGlhbGl6YXRpb24uCj4gCj4g U2lnbmVkLW9mZi1ieTogQW5ndXMgQWluc2xpZSAoUHVyaXNtKSA8YW5ndXNAYWtrZWEuY2E+Cj4g LS0tCj4gIC4uLi9iaW5kaW5ncy9jb25uZWN0b3IvdXNiLWNvbm5lY3Rvci50eHQgICAgICAgICAg IHwgIDQgKysrKwo+ICBkcml2ZXJzL3VzYi90eXBlYy90Y3BtLmMgICAgICAgICAgICAgICAgICAg ICAgICAgICB8IDE0ICsrKysrKysrKysrLS0tCj4gIDIgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0 aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9k ZXZpY2V0cmVlL2JpbmRpbmdzL2Nvbm5lY3Rvci91c2ItY29ubmVjdG9yLnR4dCBiL0RvY3VtZW50 YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9jb25uZWN0b3IvdXNiLWNvbm5lY3Rvci50eHQKPiBp bmRleCA4ODU1YmZjZmQ3NzguLmFmZTg1MWE3MTNjMyAxMDA2NDQKPiAtLS0gYS9Eb2N1bWVudGF0 aW9uL2RldmljZXRyZWUvYmluZGluZ3MvY29ubmVjdG9yL3VzYi1jb25uZWN0b3IudHh0Cj4gKysr IGIvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL2Nvbm5lY3Rvci91c2ItY29ubmVj dG9yLnR4dAo+IEBAIC0yMiw2ICsyMiwxMCBAQCBPcHRpb25hbCBwcm9wZXJ0aWVzIGZvciB1c2It Yy1jb25uZWN0b3I6Cj4gICAgb3IgVHJ5LlNSQywgc2hvdWxkIGJlICJzaW5rIiBmb3IgVHJ5LlNO SyBvciAic291cmNlIiBmb3IgVHJ5LlNSQy4KPiAgLSBkYXRhLXJvbGU6IHNob3VsZCBiZSBvbmUg b2YgImhvc3QiLCAiZGV2aWNlIiwgImR1YWwiKERSRCkgaWYgdHlwZWMKPiAgICBjb25uZWN0b3Ig c3VwcG9ydHMgVVNCIGRhdGEuCj4gKy0gaW5pdC12YnVzLXNvdXJjZTogc2V0IHRoZSBpbml0YWxp emF0aW9uIHZhbHVlIGZvciB2YnVzLXNvdXJjZSB0byB0cnVlLgo+ICsgIElmIHRoaXMgcHJvcGVy dHkgaXMgbm90IHByZXNlbnQgdGhlIGluaXRpYWwgdmFsdWUgd2lsbCBiZSBmYWxzZS4KPiArLSBp bml0LXZidXMtY2hhcmdlOiBzZXQgdGhlIGluaXRhbGl6YXRpb24gdmFsdWUgZm9yIHZidXMtY2hh cmdlIHRvIHRydWUuCj4gKyAgSWYgdGhpcyBwcm9wZXJ0eSBpcyBub3QgcHJlc2VudCB0aGUgaW5p dGlhbCB2YWx1ZSB3aWxsIGJlIGZhbHNlLgoKSWYgeW91IHB1dCB0aGUgZGVzY3JpcHRpb24gb2Yg dGhvc2UgcHJvcGVydGllcyBoZXJlLCB5b3UgYXJlIGdvaW5nIHRvCm5lZWQgdG8gcmVuYW1lIHRo ZW0uIFRob3NlIGRlc2NyaWJlIHRjcG0gc3BlY2lmaWMgcHJvcGVydGllcywgYnV0IHRvCnRoYXQg ZmlsZSB5b3Ugd2FudCB0byBwdXQgZGVzY3JpcHRpb25zIG9mIGdlbmVyaWMgcHJvcGVydGllcy4K CllvdXIgcHJvYmxlbSBpcyB0aGF0IHlvdSBjYW4gbm90IGNvcGUgd2l0aCBhIGxvc2Ugb2YgVkJV UyBhcyBhIHNpbmssCnJpZ2h0PyBGb3IgdGhhdCB5b3UganVzdCBuZWVkIG9uZSBib29sZWFuIGRl dmljZSBwcm9wZXJ0eSBJTU8uClNvbWV0aGluZyBsaWtlIGRlcGVuZC1vbi12YnVzLgoKPiAgUmVx dWlyZWQgcHJvcGVydGllcyBmb3IgdXNiLWMtY29ubmVjdG9yIHdpdGggcG93ZXIgZGVsaXZlcnkg c3VwcG9ydDoKPiAgLSBzb3VyY2UtcGRvczogQW4gYXJyYXkgb2YgdTMyIHdpdGggZWFjaCBlbnRy eSBwcm92aWRpbmcgc3VwcG9ydGVkIHBvd2VyCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL3R5 cGVjL3RjcG0uYyBiL2RyaXZlcnMvdXNiL3R5cGVjL3RjcG0uYwo+IGluZGV4IGNhN2JlZGI0NmY3 Zi4uN2Y1ZDRmMjA5ZTA3IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdXNiL3R5cGVjL3RjcG0uYwo+ ICsrKyBiL2RyaXZlcnMvdXNiL3R5cGVjL3RjcG0uYwo+IEBAIC0yNDYyLDkgKzI0NjIsNyBAQCBz dGF0aWMgaW50IHRjcG1faW5pdF92YnVzKHN0cnVjdCB0Y3BtX3BvcnQgKnBvcnQpCj4gIHsKPiAg CWludCByZXQ7Cj4gIAo+IC0JcmV0ID0gcG9ydC0+dGNwYy0+c2V0X3ZidXMocG9ydC0+dGNwYywg ZmFsc2UsIGZhbHNlKTsKPiAtCXBvcnQtPnZidXNfc291cmNlID0gZmFsc2U7Cj4gLQlwb3J0LT52 YnVzX2NoYXJnZSA9IGZhbHNlOwo+ICsJcmV0ID0gcG9ydC0+dGNwYy0+c2V0X3ZidXMocG9ydC0+ dGNwYywgcG9ydC0+dmJ1c19zb3VyY2UsIHBvcnQtPnZidXNfY2hhcmdlKTsKPiAgCXJldHVybiBy ZXQ7Cj4gIH0KPiAgCj4gQEAgLTQyNjYsNiArNDI2NCwxNiBAQCBzdGF0aWMgaW50IHRjcG1fZndf Z2V0X2NhcHMoc3RydWN0IHRjcG1fcG9ydCAqcG9ydCwKPiAgCQlyZXR1cm4gLUVJTlZBTDsKPiAg CXBvcnQtPnBvcnRfdHlwZSA9IHBvcnQtPnR5cGVjX2NhcHMudHlwZTsKPiAgCj4gKwlpZiAoZndu b2RlX3Byb3BlcnR5X3ByZXNlbnQoZndub2RlLCAiaW5pdC12YnVzLXNvdXJjZSIpKQo+ICsJCXBv cnQtPnZidXNfc291cmNlID0gdHJ1ZTsKPiArCWVsc2UKPiArCQlwb3J0LT52YnVzX3NvdXJjZSA9 IGZhbHNlOwo+ICsKPiArCWlmIChmd25vZGVfcHJvcGVydHlfcHJlc2VudChmd25vZGUsICJpbml0 LXZidXMtY2hhcmdlIikpCj4gKwkgICAgICAgIHBvcnQtPnZidXNfY2hhcmdlID0gdHJ1ZTsKPiAr CWVsc2UKPiArCSAgICAgICAgcG9ydC0+dmJ1c19jaGFyZ2UgPSBmYWxzZTsKPiArCj4gIAlpZiAo cG9ydC0+cG9ydF90eXBlID09IFRZUEVDX1BPUlRfU05LKQo+ICAJCWdvdG8gc2luazsKPiAgCj4g LS0gCj4gMi4xNy4xCgpUaGFua3MsCg== 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=-2.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT 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 67F03C4321E for ; Mon, 10 Sep 2018 07:35:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0ACA2206BB for ; Mon, 10 Sep 2018 07:35:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0ACA2206BB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727843AbeIJM2g (ORCPT ); Mon, 10 Sep 2018 08:28:36 -0400 Received: from mga04.intel.com ([192.55.52.120]:58106 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727584AbeIJM2g (ORCPT ); Mon, 10 Sep 2018 08:28:36 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Sep 2018 00:35:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,355,1531810800"; d="scan'208";a="88641967" Received: from kuha.fi.intel.com ([10.237.72.189]) by fmsmga001.fm.intel.com with SMTP; 10 Sep 2018 00:35:30 -0700 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Mon, 10 Sep 2018 10:35:29 +0300 Date: Mon, 10 Sep 2018 10:35:29 +0300 From: Heikki Krogerus To: "Angus Ainslie (Purism)" Cc: groeck7@gmail.com, Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] usb: typec: get the vbus source and charge values from the devicetree Message-ID: <20180910073529.GL25121@kuha.fi.intel.com> References: <20180906192644.24587-1-angus@akkea.ca> <20180909180531.28092-1-angus@akkea.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180909180531.28092-1-angus@akkea.ca> User-Agent: Mutt/1.9.2 (2017-12-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Sep 09, 2018 at 12:05:31PM -0600, Angus Ainslie (Purism) wrote: > If the board is being powered by USB disabling the source and sink > can remove power from the board. Allow the source and sink to be > initallized based on devicetree values. > > Changed since V1: > > use devicetree values instead of hardcoded initialization. > > Signed-off-by: Angus Ainslie (Purism) > --- > .../bindings/connector/usb-connector.txt | 4 ++++ > drivers/usb/typec/tcpm.c | 14 +++++++++++--- > 2 files changed, 15 insertions(+), 3 deletions(-) > > diff --git a/Documentation/devicetree/bindings/connector/usb-connector.txt b/Documentation/devicetree/bindings/connector/usb-connector.txt > index 8855bfcfd778..afe851a713c3 100644 > --- a/Documentation/devicetree/bindings/connector/usb-connector.txt > +++ b/Documentation/devicetree/bindings/connector/usb-connector.txt > @@ -22,6 +22,10 @@ Optional properties for usb-c-connector: > or Try.SRC, should be "sink" for Try.SNK or "source" for Try.SRC. > - data-role: should be one of "host", "device", "dual"(DRD) if typec > connector supports USB data. > +- init-vbus-source: set the initalization value for vbus-source to true. > + If this property is not present the initial value will be false. > +- init-vbus-charge: set the initalization value for vbus-charge to true. > + If this property is not present the initial value will be false. If you put the description of those properties here, you are going to need to rename them. Those describe tcpm specific properties, but to that file you want to put descriptions of generic properties. Your problem is that you can not cope with a lose of VBUS as a sink, right? For that you just need one boolean device property IMO. Something like depend-on-vbus. > Required properties for usb-c-connector with power delivery support: > - source-pdos: An array of u32 with each entry providing supported power > diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c > index ca7bedb46f7f..7f5d4f209e07 100644 > --- a/drivers/usb/typec/tcpm.c > +++ b/drivers/usb/typec/tcpm.c > @@ -2462,9 +2462,7 @@ static int tcpm_init_vbus(struct tcpm_port *port) > { > int ret; > > - ret = port->tcpc->set_vbus(port->tcpc, false, false); > - port->vbus_source = false; > - port->vbus_charge = false; > + ret = port->tcpc->set_vbus(port->tcpc, port->vbus_source, port->vbus_charge); > return ret; > } > > @@ -4266,6 +4264,16 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, > return -EINVAL; > port->port_type = port->typec_caps.type; > > + if (fwnode_property_present(fwnode, "init-vbus-source")) > + port->vbus_source = true; > + else > + port->vbus_source = false; > + > + if (fwnode_property_present(fwnode, "init-vbus-charge")) > + port->vbus_charge = true; > + else > + port->vbus_charge = false; > + > if (port->port_type == TYPEC_PORT_SNK) > goto sink; > > -- > 2.17.1 Thanks, -- heikki