From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226+mCounaPtsLEhWnJrer74EogV+lXhVMEuu+qvJeA2ioGVeXWYCvRXRPFZzBCjyCdFoLFd ARC-Seal: i=1; a=rsa-sha256; t=1519135245; cv=none; d=google.com; s=arc-20160816; b=zg5lF39BRxISwdWS16BDckTud0XyEs4u+oJ5jINhIaxwt0//N1AyLl6AEMjklTc0TF uRg6SBshJwQ8DEoTShFoUWrUgWoxGvFR/OVcIyTXxyBbUq2ZUkohPDh3qWMoWaLi3G/k Aw/HBf7W8CeDc0wzTz5fmWMSc5ZiJypMSW3ScXGPurSo3YgllHCG/wZEw5Ue3MBXbuWJ +hF1SdWmVfJnVIkCNovpjiS6qDwGtvVQGR7E+0lLuuqk7c2Y/2YZEUgS+vGbo+babloC YbumJ0W2I+nGHssnFoFqmvPkIUKxsORVJ+VR3Fcw/MRUTFLEiHX7mH5Qb9U55vju/w6F k4KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject :dkim-signature:arc-authentication-results; bh=ZpV12qcL9Vio9bqj+uMjGLn3+pzSCyDvxj+vq9XQAxk=; b=IDzxW34trHQWl+RU3zp1wm5e4kTd77eNSqP1SkzCTbFSuMpe1ODzdd0wAndR+rUJL8 gUCJSRTbuQeAcaC23fcr7I9gbROuaN1Zmd6gZZukb9ucoYf7Gzcn/56yJVb3J+C2paH0 1zCYXfjhujo3g38U02WlOLM2x+yHTr/G+LnLQS65fAM/oTRWEmYw3fppKCRCiIMXPFK7 V4fNOJt7wxefGkIc9iJkX7ICfU4kKD9niMmxJZRuqUTS4MFNNh4GakgRzBRmEXIyeOTm EzO6Tr2DzNm3zFbFSkH9SXbfaWHjt6gsN0aoMWV1y6uG6A9Hx1EXS7S02rqLI3Js7mSs Mfuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=QGTdYBBs; spf=pass (google.com: domain of rogerq@ti.com designates 198.47.27.77 as permitted sender) smtp.mailfrom=rogerq@ti.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=QGTdYBBs; spf=pass (google.com: domain of rogerq@ti.com designates 198.47.27.77 as permitted sender) smtp.mailfrom=rogerq@ti.com; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Subject: Re: [PATCH v2] usb: host: ehci-platform: add support for optional external vbus supply To: Amelie Delaunay , Greg Kroah-Hartman , Rob Herring , Mark Rutland , Tony Prisk , Alan Stern CC: , , , References: <1519131492-27913-1-git-send-email-amelie.delaunay@st.com> From: Roger Quadros Message-ID: Date: Tue, 20 Feb 2018 16:00:36 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <1519131492-27913-1-git-send-email-amelie.delaunay@st.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-GB Content-Transfer-Encoding: 7bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1592910586052663664?= X-GMAIL-MSGID: =?utf-8?q?1592928758709607534?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Hi, On 20/02/18 14:58, Amelie Delaunay wrote: > On some boards, especially when vbus supply requires large current, > and the charge pump on the PHY isn't enough, an external vbus power switch > may be used. > Add support for this optional external vbus supply in ehci-platform. > > Signed-off-by: Amelie Delaunay > > --- > Changes in v2: > * Address Roger Quadros comments: move regulator_enable/disable from > ehci_platform_power_on/off to ehci_platform_port_power. > --- > Documentation/devicetree/bindings/usb/usb-ehci.txt | 1 + > drivers/usb/host/ehci-platform.c | 31 ++++++++++++++++++++++ > 2 files changed, 32 insertions(+) > > diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt > index 3efde12..fc480cd 100644 > --- a/Documentation/devicetree/bindings/usb/usb-ehci.txt > +++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt > @@ -19,6 +19,7 @@ Optional properties: > - phys : phandle + phy specifier pair > - phy-names : "usb" > - resets : phandle + reset specifier pair > + - vbus-supply : phandle of regulator supplying vbus > Can platforms have more than one regulator e.g. one regulator per port? > Example (Sequoia 440EPx): > ehci@e0000300 { > diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c > index b065a96..05be100 100644 > --- a/drivers/usb/host/ehci-platform.c > +++ b/drivers/usb/host/ehci-platform.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -46,6 +47,7 @@ struct ehci_platform_priv { > struct reset_control *rsts; > struct phy **phys; > int num_phys; > + struct regulator *vbus_supply; > bool reset_on_resume; > }; > > @@ -76,6 +78,25 @@ static int ehci_platform_reset(struct usb_hcd *hcd) > return 0; > } > > +static int ehci_platform_port_power(struct usb_hcd *hcd, int portnum, > + bool enable) > +{ > + struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd); > + int ret = 0; > + > + if (priv->vbus_supply) { > + if (enable) > + ret = regulator_enable(priv->vbus_supply); > + else > + ret = regulator_disable(priv->vbus_supply); > + if (ret) > + dev_err(hcd->self.controller, > + "failed to %s vbus supply: %d\n", > + enable ? "enable" : "disable", ret); > + } > + return ret; > +} > + > static int ehci_platform_power_on(struct platform_device *dev) > { > struct usb_hcd *hcd = platform_get_drvdata(dev); > @@ -134,6 +155,7 @@ static struct hc_driver __read_mostly ehci_platform_hc_driver; > static const struct ehci_driver_overrides platform_overrides __initconst = { > .reset = ehci_platform_reset, > .extra_priv_size = sizeof(struct ehci_platform_priv), > + .port_power = ehci_platform_port_power, > }; > > static struct usb_ehci_pdata ehci_platform_defaults = { > @@ -247,6 +269,15 @@ static int ehci_platform_probe(struct platform_device *dev) > if (err) > goto err_put_clks; > > + priv->vbus_supply = devm_regulator_get_optional(&dev->dev, "vbus"); > + if (IS_ERR(priv->vbus_supply)) { > + err = PTR_ERR(priv->vbus_supply); > + if (err == -ENODEV) > + priv->vbus_supply = NULL; > + else > + goto err_reset; > + } > + > if (pdata->big_endian_desc) > ehci->big_endian_desc = 1; > if (pdata->big_endian_mmio) > -- cheers, -roger Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Quadros Subject: Re: [PATCH v2] usb: host: ehci-platform: add support for optional external vbus supply Date: Tue, 20 Feb 2018 16:00:36 +0200 Message-ID: References: <1519131492-27913-1-git-send-email-amelie.delaunay@st.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1519131492-27913-1-git-send-email-amelie.delaunay@st.com> Content-Language: en-GB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Amelie Delaunay , Greg Kroah-Hartman , Rob Herring , Mark Rutland , Tony Prisk , Alan Stern Cc: devicetree@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org Hi, On 20/02/18 14:58, Amelie Delaunay wrote: > On some boards, especially when vbus supply requires large current, > and the charge pump on the PHY isn't enough, an external vbus power switch > may be used. > Add support for this optional external vbus supply in ehci-platform. > > Signed-off-by: Amelie Delaunay > > --- > Changes in v2: > * Address Roger Quadros comments: move regulator_enable/disable from > ehci_platform_power_on/off to ehci_platform_port_power. > --- > Documentation/devicetree/bindings/usb/usb-ehci.txt | 1 + > drivers/usb/host/ehci-platform.c | 31 ++++++++++++++++++++++ > 2 files changed, 32 insertions(+) > > diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt > index 3efde12..fc480cd 100644 > --- a/Documentation/devicetree/bindings/usb/usb-ehci.txt > +++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt > @@ -19,6 +19,7 @@ Optional properties: > - phys : phandle + phy specifier pair > - phy-names : "usb" > - resets : phandle + reset specifier pair > + - vbus-supply : phandle of regulator supplying vbus > Can platforms have more than one regulator e.g. one regulator per port? > Example (Sequoia 440EPx): > ehci@e0000300 { > diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c > index b065a96..05be100 100644 > --- a/drivers/usb/host/ehci-platform.c > +++ b/drivers/usb/host/ehci-platform.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -46,6 +47,7 @@ struct ehci_platform_priv { > struct reset_control *rsts; > struct phy **phys; > int num_phys; > + struct regulator *vbus_supply; > bool reset_on_resume; > }; > > @@ -76,6 +78,25 @@ static int ehci_platform_reset(struct usb_hcd *hcd) > return 0; > } > > +static int ehci_platform_port_power(struct usb_hcd *hcd, int portnum, > + bool enable) > +{ > + struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd); > + int ret = 0; > + > + if (priv->vbus_supply) { > + if (enable) > + ret = regulator_enable(priv->vbus_supply); > + else > + ret = regulator_disable(priv->vbus_supply); > + if (ret) > + dev_err(hcd->self.controller, > + "failed to %s vbus supply: %d\n", > + enable ? "enable" : "disable", ret); > + } > + return ret; > +} > + > static int ehci_platform_power_on(struct platform_device *dev) > { > struct usb_hcd *hcd = platform_get_drvdata(dev); > @@ -134,6 +155,7 @@ static struct hc_driver __read_mostly ehci_platform_hc_driver; > static const struct ehci_driver_overrides platform_overrides __initconst = { > .reset = ehci_platform_reset, > .extra_priv_size = sizeof(struct ehci_platform_priv), > + .port_power = ehci_platform_port_power, > }; > > static struct usb_ehci_pdata ehci_platform_defaults = { > @@ -247,6 +269,15 @@ static int ehci_platform_probe(struct platform_device *dev) > if (err) > goto err_put_clks; > > + priv->vbus_supply = devm_regulator_get_optional(&dev->dev, "vbus"); > + if (IS_ERR(priv->vbus_supply)) { > + err = PTR_ERR(priv->vbus_supply); > + if (err == -ENODEV) > + priv->vbus_supply = NULL; > + else > + goto err_reset; > + } > + > if (pdata->big_endian_desc) > ehci->big_endian_desc = 1; > if (pdata->big_endian_mmio) > -- cheers, -roger Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki 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: host: ehci-platform: add support for optional external vbus supply From: Roger Quadros Message-Id: Date: Tue, 20 Feb 2018 16:00:36 +0200 To: Amelie Delaunay , Greg Kroah-Hartman , Rob Herring , Mark Rutland , Tony Prisk , Alan Stern Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-ID: SGksCgpPbiAyMC8wMi8xOCAxNDo1OCwgQW1lbGllIERlbGF1bmF5IHdyb3RlOgo+IE9uIHNvbWUg Ym9hcmRzLCBlc3BlY2lhbGx5IHdoZW4gdmJ1cyBzdXBwbHkgcmVxdWlyZXMgbGFyZ2UgY3VycmVu dCwKPiBhbmQgdGhlIGNoYXJnZSBwdW1wIG9uIHRoZSBQSFkgaXNuJ3QgZW5vdWdoLCBhbiBleHRl cm5hbCB2YnVzIHBvd2VyIHN3aXRjaAo+IG1heSBiZSB1c2VkLgo+IEFkZCBzdXBwb3J0IGZvciB0 aGlzIG9wdGlvbmFsIGV4dGVybmFsIHZidXMgc3VwcGx5IGluIGVoY2ktcGxhdGZvcm0uCj4gCj4g U2lnbmVkLW9mZi1ieTogQW1lbGllIERlbGF1bmF5IDxhbWVsaWUuZGVsYXVuYXlAc3QuY29tPgo+ IAo+IC0tLQo+IENoYW5nZXMgaW4gdjI6Cj4gICogQWRkcmVzcyBSb2dlciBRdWFkcm9zIGNvbW1l bnRzOiBtb3ZlIHJlZ3VsYXRvcl9lbmFibGUvZGlzYWJsZSBmcm9tCj4gZWhjaV9wbGF0Zm9ybV9w b3dlcl9vbi9vZmYgdG8gZWhjaV9wbGF0Zm9ybV9wb3J0X3Bvd2VyLgo+IC0tLQo+ICBEb2N1bWVu dGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3MvdXNiL3VzYi1laGNpLnR4dCB8ICAxICsKPiAgZHJp dmVycy91c2IvaG9zdC9laGNpLXBsYXRmb3JtLmMgICAgICAgICAgICAgICAgICAgfCAzMSArKysr KysrKysrKysrKysrKysrKysrCj4gIDIgZmlsZXMgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKQo+ IAo+IGRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3MvdXNiL3Vz Yi1laGNpLnR4dCBiL0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy91c2IvdXNiLWVo Y2kudHh0Cj4gaW5kZXggM2VmZGUxMi4uZmM0ODBjZCAxMDA2NDQKPiAtLS0gYS9Eb2N1bWVudGF0 aW9uL2RldmljZXRyZWUvYmluZGluZ3MvdXNiL3VzYi1laGNpLnR4dAo+ICsrKyBiL0RvY3VtZW50 YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy91c2IvdXNiLWVoY2kudHh0Cj4gQEAgLTE5LDYgKzE5 LDcgQEAgT3B0aW9uYWwgcHJvcGVydGllczoKPiAgIC0gcGh5cyA6IHBoYW5kbGUgKyBwaHkgc3Bl Y2lmaWVyIHBhaXIKPiAgIC0gcGh5LW5hbWVzIDogInVzYiIKPiAgIC0gcmVzZXRzIDogcGhhbmRs ZSArIHJlc2V0IHNwZWNpZmllciBwYWlyCj4gKyAtIHZidXMtc3VwcGx5IDogcGhhbmRsZSBvZiBy ZWd1bGF0b3Igc3VwcGx5aW5nIHZidXMKPiAgCgpDYW4gcGxhdGZvcm1zIGhhdmUgbW9yZSB0aGFu IG9uZSByZWd1bGF0b3IgZS5nLiBvbmUgcmVndWxhdG9yIHBlciBwb3J0PwoKPiAgRXhhbXBsZSAo U2VxdW9pYSA0NDBFUHgpOgo+ICAgICAgZWhjaUBlMDAwMDMwMCB7Cj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvdXNiL2hvc3QvZWhjaS1wbGF0Zm9ybS5jIGIvZHJpdmVycy91c2IvaG9zdC9laGNpLXBs YXRmb3JtLmMKPiBpbmRleCBiMDY1YTk2Li4wNWJlMTAwIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMv dXNiL2hvc3QvZWhjaS1wbGF0Zm9ybS5jCj4gKysrIGIvZHJpdmVycy91c2IvaG9zdC9laGNpLXBs YXRmb3JtLmMKPiBAQCAtMjksNiArMjksNyBAQAo+ICAjaW5jbHVkZSA8bGludXgvb2YuaD4KPiAg I2luY2x1ZGUgPGxpbnV4L3BoeS9waHkuaD4KPiAgI2luY2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2Rl dmljZS5oPgo+ICsjaW5jbHVkZSA8bGludXgvcmVndWxhdG9yL2NvbnN1bWVyLmg+Cj4gICNpbmNs dWRlIDxsaW51eC9yZXNldC5oPgo+ICAjaW5jbHVkZSA8bGludXgvdXNiLmg+Cj4gICNpbmNsdWRl IDxsaW51eC91c2IvaGNkLmg+Cj4gQEAgLTQ2LDYgKzQ3LDcgQEAgc3RydWN0IGVoY2lfcGxhdGZv cm1fcHJpdiB7Cj4gIAlzdHJ1Y3QgcmVzZXRfY29udHJvbCAqcnN0czsKPiAgCXN0cnVjdCBwaHkg KipwaHlzOwo+ICAJaW50IG51bV9waHlzOwo+ICsJc3RydWN0IHJlZ3VsYXRvciAqdmJ1c19zdXBw bHk7Cj4gIAlib29sIHJlc2V0X29uX3Jlc3VtZTsKPiAgfTsKPiAgCj4gQEAgLTc2LDYgKzc4LDI1 IEBAIHN0YXRpYyBpbnQgZWhjaV9wbGF0Zm9ybV9yZXNldChzdHJ1Y3QgdXNiX2hjZCAqaGNkKQo+ ICAJcmV0dXJuIDA7Cj4gIH0KPiAgCj4gK3N0YXRpYyBpbnQgZWhjaV9wbGF0Zm9ybV9wb3J0X3Bv d2VyKHN0cnVjdCB1c2JfaGNkICpoY2QsIGludCBwb3J0bnVtLAo+ICsJCQkJICAgIGJvb2wgZW5h YmxlKQo+ICt7Cj4gKwlzdHJ1Y3QgZWhjaV9wbGF0Zm9ybV9wcml2ICpwcml2ID0gaGNkX3RvX2Vo Y2lfcHJpdihoY2QpOwo+ICsJaW50IHJldCA9IDA7Cj4gKwo+ICsJaWYgKHByaXYtPnZidXNfc3Vw cGx5KSB7Cj4gKwkJaWYgKGVuYWJsZSkKPiArCQkJcmV0ID0gcmVndWxhdG9yX2VuYWJsZShwcml2 LT52YnVzX3N1cHBseSk7Cj4gKwkJZWxzZQo+ICsJCQlyZXQgPSByZWd1bGF0b3JfZGlzYWJsZShw cml2LT52YnVzX3N1cHBseSk7Cj4gKwkJaWYgKHJldCkKPiArCQkJZGV2X2VycihoY2QtPnNlbGYu Y29udHJvbGxlciwKPiArCQkJCSJmYWlsZWQgdG8gJXMgdmJ1cyBzdXBwbHk6ICVkXG4iLAo+ICsJ CQkJZW5hYmxlID8gImVuYWJsZSIgOiAiZGlzYWJsZSIsIHJldCk7Cj4gKwl9Cj4gKwlyZXR1cm4g cmV0Owo+ICt9Cj4gKwo+ICBzdGF0aWMgaW50IGVoY2lfcGxhdGZvcm1fcG93ZXJfb24oc3RydWN0 IHBsYXRmb3JtX2RldmljZSAqZGV2KQo+ICB7Cj4gIAlzdHJ1Y3QgdXNiX2hjZCAqaGNkID0gcGxh dGZvcm1fZ2V0X2RydmRhdGEoZGV2KTsKPiBAQCAtMTM0LDYgKzE1NSw3IEBAIHN0YXRpYyBzdHJ1 Y3QgaGNfZHJpdmVyIF9fcmVhZF9tb3N0bHkgZWhjaV9wbGF0Zm9ybV9oY19kcml2ZXI7Cj4gIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZWhjaV9kcml2ZXJfb3ZlcnJpZGVzIHBsYXRmb3JtX292ZXJyaWRl cyBfX2luaXRjb25zdCA9IHsKPiAgCS5yZXNldCA9CQllaGNpX3BsYXRmb3JtX3Jlc2V0LAo+ICAJ LmV4dHJhX3ByaXZfc2l6ZSA9CXNpemVvZihzdHJ1Y3QgZWhjaV9wbGF0Zm9ybV9wcml2KSwKPiAr CS5wb3J0X3Bvd2VyID0JCWVoY2lfcGxhdGZvcm1fcG9ydF9wb3dlciwKPiAgfTsKPiAgCj4gIHN0 YXRpYyBzdHJ1Y3QgdXNiX2VoY2lfcGRhdGEgZWhjaV9wbGF0Zm9ybV9kZWZhdWx0cyA9IHsKPiBA QCAtMjQ3LDYgKzI2OSwxNSBAQCBzdGF0aWMgaW50IGVoY2lfcGxhdGZvcm1fcHJvYmUoc3RydWN0 IHBsYXRmb3JtX2RldmljZSAqZGV2KQo+ICAJaWYgKGVycikKPiAgCQlnb3RvIGVycl9wdXRfY2xr czsKPiAgCj4gKwlwcml2LT52YnVzX3N1cHBseSA9IGRldm1fcmVndWxhdG9yX2dldF9vcHRpb25h bCgmZGV2LT5kZXYsICJ2YnVzIik7Cj4gKwlpZiAoSVNfRVJSKHByaXYtPnZidXNfc3VwcGx5KSkg ewo+ICsJCWVyciA9IFBUUl9FUlIocHJpdi0+dmJ1c19zdXBwbHkpOwo+ICsJCWlmIChlcnIgPT0g LUVOT0RFVikKPiArCQkJcHJpdi0+dmJ1c19zdXBwbHkgPSBOVUxMOwo+ICsJCWVsc2UKPiArCQkJ Z290byBlcnJfcmVzZXQ7Cj4gKwl9Cj4gKwo+ICAJaWYgKHBkYXRhLT5iaWdfZW5kaWFuX2Rlc2Mp Cj4gIAkJZWhjaS0+YmlnX2VuZGlhbl9kZXNjID0gMTsKPiAgCWlmIChwZGF0YS0+YmlnX2VuZGlh bl9tbWlvKQo+Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: rogerq@ti.com (Roger Quadros) Date: Tue, 20 Feb 2018 16:00:36 +0200 Subject: [PATCH v2] usb: host: ehci-platform: add support for optional external vbus supply In-Reply-To: <1519131492-27913-1-git-send-email-amelie.delaunay@st.com> References: <1519131492-27913-1-git-send-email-amelie.delaunay@st.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, On 20/02/18 14:58, Amelie Delaunay wrote: > On some boards, especially when vbus supply requires large current, > and the charge pump on the PHY isn't enough, an external vbus power switch > may be used. > Add support for this optional external vbus supply in ehci-platform. > > Signed-off-by: Amelie Delaunay > > --- > Changes in v2: > * Address Roger Quadros comments: move regulator_enable/disable from > ehci_platform_power_on/off to ehci_platform_port_power. > --- > Documentation/devicetree/bindings/usb/usb-ehci.txt | 1 + > drivers/usb/host/ehci-platform.c | 31 ++++++++++++++++++++++ > 2 files changed, 32 insertions(+) > > diff --git a/Documentation/devicetree/bindings/usb/usb-ehci.txt b/Documentation/devicetree/bindings/usb/usb-ehci.txt > index 3efde12..fc480cd 100644 > --- a/Documentation/devicetree/bindings/usb/usb-ehci.txt > +++ b/Documentation/devicetree/bindings/usb/usb-ehci.txt > @@ -19,6 +19,7 @@ Optional properties: > - phys : phandle + phy specifier pair > - phy-names : "usb" > - resets : phandle + reset specifier pair > + - vbus-supply : phandle of regulator supplying vbus > Can platforms have more than one regulator e.g. one regulator per port? > Example (Sequoia 440EPx): > ehci at e0000300 { > diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c > index b065a96..05be100 100644 > --- a/drivers/usb/host/ehci-platform.c > +++ b/drivers/usb/host/ehci-platform.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -46,6 +47,7 @@ struct ehci_platform_priv { > struct reset_control *rsts; > struct phy **phys; > int num_phys; > + struct regulator *vbus_supply; > bool reset_on_resume; > }; > > @@ -76,6 +78,25 @@ static int ehci_platform_reset(struct usb_hcd *hcd) > return 0; > } > > +static int ehci_platform_port_power(struct usb_hcd *hcd, int portnum, > + bool enable) > +{ > + struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd); > + int ret = 0; > + > + if (priv->vbus_supply) { > + if (enable) > + ret = regulator_enable(priv->vbus_supply); > + else > + ret = regulator_disable(priv->vbus_supply); > + if (ret) > + dev_err(hcd->self.controller, > + "failed to %s vbus supply: %d\n", > + enable ? "enable" : "disable", ret); > + } > + return ret; > +} > + > static int ehci_platform_power_on(struct platform_device *dev) > { > struct usb_hcd *hcd = platform_get_drvdata(dev); > @@ -134,6 +155,7 @@ static struct hc_driver __read_mostly ehci_platform_hc_driver; > static const struct ehci_driver_overrides platform_overrides __initconst = { > .reset = ehci_platform_reset, > .extra_priv_size = sizeof(struct ehci_platform_priv), > + .port_power = ehci_platform_port_power, > }; > > static struct usb_ehci_pdata ehci_platform_defaults = { > @@ -247,6 +269,15 @@ static int ehci_platform_probe(struct platform_device *dev) > if (err) > goto err_put_clks; > > + priv->vbus_supply = devm_regulator_get_optional(&dev->dev, "vbus"); > + if (IS_ERR(priv->vbus_supply)) { > + err = PTR_ERR(priv->vbus_supply); > + if (err == -ENODEV) > + priv->vbus_supply = NULL; > + else > + goto err_reset; > + } > + > if (pdata->big_endian_desc) > ehci->big_endian_desc = 1; > if (pdata->big_endian_mmio) > -- cheers, -roger Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki