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: [2/2] usb: host: xhci-plat: Fix clock resource by adding a register clock From: Manu Gautam Message-Id: Date: Wed, 28 Feb 2018 21:39:05 +0530 To: Gregory CLEMENT , Greg Kroah-Hartman , Mathias Nyman , linux-usb@vger.kernel.org Cc: Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Thomas Petazzoni , linux-arm-kernel@lists.infradead.org, Antoine Tenart , =?UTF-8?Q?Miqu=c3=a8l_Raynal?= , Nadav Haklai , Shadi Ammouri , Omri Itach , Hanna Hawa , Igal Liberman , Marcin Wojtas List-ID: SGksCgoKT24gMi8xNC8yMDE4IDk6NDYgUE0sIEdyZWdvcnkgQ0xFTUVOVCB3cm90ZToKPiBPbiBB cm1hZGEgN0svOEsgd2UgbmVlZCB0byBleHBsaWNpdGx5IGVuYWJsZSB0aGUgcmVnaXN0ZXIgY2xv Y2suIFRoaXMKPiBjbG9jayBpcyBvcHRpb25hbCBiZWNhdXNlIG5vdCBhbGwgdGhlIFNvQ3MgdXNp bmcgdGhpcyBJUCBuZWVkIGl0IGJ1dCBhdAo+IGxlYXN0IGZvciBBcm1hZGEgN0svOEsgaXQgaXMg YWN0dWFsbHkgbWFuZGF0b3J5Lgo+Cj4gVGhlIGNoYW5nZSB3YXMgZG9uZSBhdCB4aGNpLXBsYXQg bGV2ZWwgYW5kIG5vdCBhdCBhIHhoY2ktbXZlYnUuYyBiZWNhdXNlLAo+IGl0IGlzIGV4cGVjdGVk IHRoYXQgb3RoZXIgU29DIHdvdWxkIGhhdmUgdGhpcyBraW5kIG9mIGNvbnN0cmFpbnQuCj4KPiBU aGUgYmluZGluZyBkb2N1bWVudGF0aW9uIGlzIHVwZGF0aW5nIGFjY29yZGluZ2x5Lgo+Cj4gU2ln bmVkLW9mZi1ieTogR3JlZ29yeSBDTEVNRU5UIDxncmVnb3J5LmNsZW1lbnRAYm9vdGxpbi5jb20+ Cj4gLS0tCj4gIERvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy91c2IvdXNiLXhoY2ku dHh0IHwgIDUgKysrLQo+ICBkcml2ZXJzL3VzYi9ob3N0L3hoY2ktcGxhdC5jICAgICAgICAgICAg ICAgICAgICAgICB8IDMzICsrKysrKysrKysrKysrKysrKy0tLS0KPiAgZHJpdmVycy91c2IvaG9z dC94aGNpLmggICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgMyArLQo+ICAzIGZpbGVzIGNo YW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEv RG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL3VzYi91c2IteGhjaS50eHQgYi9Eb2N1 bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3MvdXNiL3VzYi14aGNpLnR4dAo+IGluZGV4IGUy ZWE1OWJiY2E5My4uZTRiMTQ1MTFmNGY4IDEwMDY0NAo+IC0tLSBhL0RvY3VtZW50YXRpb24vZGV2 aWNldHJlZS9iaW5kaW5ncy91c2IvdXNiLXhoY2kudHh0Cj4gKysrIGIvRG9jdW1lbnRhdGlvbi9k ZXZpY2V0cmVlL2JpbmRpbmdzL3VzYi91c2IteGhjaS50eHQKPiBAQCAtMjcsNyArMjcsMTAgQEAg UmVxdWlyZWQgcHJvcGVydGllczoKPiAgICAtIGludGVycnVwdHM6IG9uZSBYSENJIGludGVycnVw dCBzaG91bGQgYmUgZGVzY3JpYmVkIGhlcmUuCj4gIAo+ICBPcHRpb25hbCBwcm9wZXJ0aWVzOgo+ IC0gIC0gY2xvY2tzOiByZWZlcmVuY2UgdG8gYSBjbG9jawo+ICsgIC0gY2xvY2tzOiByZWZlcmVu Y2UgdG8gdGhlIGNsb2Nrcwo+ICsgIC0gY2xvY2stbmFtZXM6IG1hbmRhdG9yeSBpZiB0aGVyZSBp cyBhIHNlY29uZCBjbG9jaywgaW4gdGhpcyBjYXNlCj4gKyAgICB0aGUgbmFtZSBtdXN0IGJlICJj b3JlIiBmb3IgdGhlIGZpcnN0IGNsb2NrIGFuZCAicmVnIiBmb3IgdGhlCj4gKyAgICBzZWNvbmQg b25lCj4gICAgLSB1c2IyLWxwbS1kaXNhYmxlOiBpbmRpY2F0ZSBpZiB3ZSBkb24ndCB3YW50IHRv IGVuYWJsZSBVU0IyIEhXIExQTQo+ICAgIC0gdXNiMy1scG0tY2FwYWJsZTogZGV0ZXJtaW5lcyBp ZiBwbGF0Zm9ybSBpcyBVU0IzIExQTSBjYXBhYmxlCj4gICAgLSBxdWlyay1icm9rZW4tcG9ydC1w ZWQ6IHNldCBpZiB0aGUgY29udHJvbGxlciBoYXMgYnJva2VuIHBvcnQgZGlzYWJsZSBtZWNoYW5p c20KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvaG9zdC94aGNpLXBsYXQuYyBiL2RyaXZlcnMv dXNiL2hvc3QveGhjaS1wbGF0LmMKPiBpbmRleCA3OWFmYWFjNTdlZjYuLmZkMGMzOTkwMTNhMiAx MDA2NDQKPiAtLS0gYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktcGxhdC5jCj4gKysrIGIvZHJpdmVy cy91c2IvaG9zdC94aGNpLXBsYXQuYwo+IEBAIC0xNTcsNiArMTU3LDcgQEAgc3RhdGljIGludCB4 aGNpX3BsYXRfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKPiAgCXN0cnVjdCBy ZXNvdXJjZSAgICAgICAgICpyZXM7Cj4gIAlzdHJ1Y3QgdXNiX2hjZAkJKmhjZDsKPiAgCXN0cnVj dCBjbGsgICAgICAgICAgICAgICpjbGs7Cj4gKwlzdHJ1Y3QgY2xrICAgICAgICAgICAgICAqcmVn X2NsazsKPiAgCWludAkJCXJldDsKPiAgCWludAkJCWlycTsKPiAgCj4gQEAgLTIyNiwxNyArMjI3 LDI3IEBAIHN0YXRpYyBpbnQgeGhjaV9wbGF0X3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2Ug KnBkZXYpCj4gIAloY2QtPnJzcmNfbGVuID0gcmVzb3VyY2Vfc2l6ZShyZXMpOwo+ICAKPiAgCS8q Cj4gLQkgKiBOb3QgYWxsIHBsYXRmb3JtcyBoYXZlIGEgY2xrIHNvIGl0IGlzIG5vdCBhbiBlcnJv ciBpZiB0aGUKPiAtCSAqIGNsb2NrIGRvZXMgbm90IGV4aXN0cy4KPiArCSAqIE5vdCBhbGwgcGxh dGZvcm1zIGhhdmUgY2xrcyBzbyBpdCBpcyBub3QgYW4gZXJyb3IgaWYgdGhlCj4gKwkgKiBjbG9j ayBkbyBub3QgZXhpc3QuCj4gIAkgKi8KPiArCXJlZ19jbGsgPSBkZXZtX2Nsa19nZXQoJnBkZXYt PmRldiwgInJlZyIpOwo+ICsJaWYgKCFJU19FUlIocmVnX2NsaykpIHsKPiArCQlyZXQgPSBjbGtf cHJlcGFyZV9lbmFibGUocmVnX2Nsayk7Cj4gKwkJaWYgKHJldCkKPiArCQkJZ290byBwdXRfaGNk Owo+ICsJfSBlbHNlIGlmIChQVFJfRVJSKHJlZ19jbGspID09IC1FUFJPQkVfREVGRVIpIHsKPiAr CQlyZXQgPSAtRVBST0JFX0RFRkVSOwo+ICsJCWdvdG8gcHV0X2hjZDsKPiArCX0KPiArCgpIb3cg YWJvdXQgdXNpbmcgY2xrX2J1bGtfIEFQSXM/Cgo+ICAJY2xrID0gZGV2bV9jbGtfZ2V0KCZwZGV2 LT5kZXYsIE5VTEwpOwo+ICAJaWYgKCFJU19FUlIoY2xrKSkgewo+ICAJCXJldCA9IGNsa19wcmVw YXJlX2VuYWJsZShjbGspOwo+Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: mgautam@codeaurora.org (Manu Gautam) Date: Wed, 28 Feb 2018 21:39:05 +0530 Subject: [PATCH 2/2] usb: host: xhci-plat: Fix clock resource by adding a register clock In-Reply-To: <20180214161620.4401-3-gregory.clement@bootlin.com> References: <20180214161620.4401-1-gregory.clement@bootlin.com> <20180214161620.4401-3-gregory.clement@bootlin.com> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, On 2/14/2018 9:46 PM, Gregory CLEMENT wrote: > On Armada 7K/8K we need to explicitly enable the register clock. This > clock is optional because not all the SoCs using this IP need it but at > least for Armada 7K/8K it is actually mandatory. > > The change was done at xhci-plat level and not at a xhci-mvebu.c because, > it is expected that other SoC would have this kind of constraint. > > The binding documentation is updating accordingly. > > Signed-off-by: Gregory CLEMENT > --- > Documentation/devicetree/bindings/usb/usb-xhci.txt | 5 +++- > drivers/usb/host/xhci-plat.c | 33 ++++++++++++++++++---- > drivers/usb/host/xhci.h | 3 +- > 3 files changed, 33 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt > index e2ea59bbca93..e4b14511f4f8 100644 > --- a/Documentation/devicetree/bindings/usb/usb-xhci.txt > +++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt > @@ -27,7 +27,10 @@ Required properties: > - interrupts: one XHCI interrupt should be described here. > > Optional properties: > - - clocks: reference to a clock > + - clocks: reference to the clocks > + - clock-names: mandatory if there is a second clock, in this case > + the name must be "core" for the first clock and "reg" for the > + second one > - usb2-lpm-disable: indicate if we don't want to enable USB2 HW LPM > - usb3-lpm-capable: determines if platform is USB3 LPM capable > - quirk-broken-port-ped: set if the controller has broken port disable mechanism > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > index 79afaac57ef6..fd0c399013a2 100644 > --- a/drivers/usb/host/xhci-plat.c > +++ b/drivers/usb/host/xhci-plat.c > @@ -157,6 +157,7 @@ static int xhci_plat_probe(struct platform_device *pdev) > struct resource *res; > struct usb_hcd *hcd; > struct clk *clk; > + struct clk *reg_clk; > int ret; > int irq; > > @@ -226,17 +227,27 @@ static int xhci_plat_probe(struct platform_device *pdev) > hcd->rsrc_len = resource_size(res); > > /* > - * Not all platforms have a clk so it is not an error if the > - * clock does not exists. > + * Not all platforms have clks so it is not an error if the > + * clock do not exist. > */ > + reg_clk = devm_clk_get(&pdev->dev, "reg"); > + if (!IS_ERR(reg_clk)) { > + ret = clk_prepare_enable(reg_clk); > + if (ret) > + goto put_hcd; > + } else if (PTR_ERR(reg_clk) == -EPROBE_DEFER) { > + ret = -EPROBE_DEFER; > + goto put_hcd; > + } > + How about using clk_bulk_ APIs? > clk = devm_clk_get(&pdev->dev, NULL); > if (!IS_ERR(clk)) { > ret = clk_prepare_enable(clk); > -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project