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: Mathias Nyman Message-Id: <0643f36a-cee7-8e4a-77c3-c60672ca385f@intel.com> Date: Wed, 28 Feb 2018 18:05:20 +0200 To: Gregory CLEMENT , Greg Kroah-Hartman , 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 , Rob Herring List-ID: T24gMTQuMDIuMjAxOCAxODoxNiwgR3JlZ29yeSBDTEVNRU5UIHdyb3RlOgo+IE9uIEFybWFkYSA3 Sy84SyB3ZSBuZWVkIHRvIGV4cGxpY2l0bHkgZW5hYmxlIHRoZSByZWdpc3RlciBjbG9jay4gVGhp cwo+IGNsb2NrIGlzIG9wdGlvbmFsIGJlY2F1c2Ugbm90IGFsbCB0aGUgU29DcyB1c2luZyB0aGlz IElQIG5lZWQgaXQgYnV0IGF0Cj4gbGVhc3QgZm9yIEFybWFkYSA3Sy84SyBpdCBpcyBhY3R1YWxs eSBtYW5kYXRvcnkuCj4gCj4gVGhlIGNoYW5nZSB3YXMgZG9uZSBhdCB4aGNpLXBsYXQgbGV2ZWwg YW5kIG5vdCBhdCBhIHhoY2ktbXZlYnUuYyBiZWNhdXNlLAo+IGl0IGlzIGV4cGVjdGVkIHRoYXQg b3RoZXIgU29DIHdvdWxkIGhhdmUgdGhpcyBraW5kIG9mIGNvbnN0cmFpbnQuCj4gCj4gVGhlIGJp bmRpbmcgZG9jdW1lbnRhdGlvbiBpcyB1cGRhdGluZyBhY2NvcmRpbmdseS4KPiAKPiBTaWduZWQt b2ZmLWJ5OiBHcmVnb3J5IENMRU1FTlQgPGdyZWdvcnkuY2xlbWVudEBib290bGluLmNvbT4KPiAt LS0KPiAgIERvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy91c2IvdXNiLXhoY2kudHh0 IHwgIDUgKysrLQo+ICAgZHJpdmVycy91c2IvaG9zdC94aGNpLXBsYXQuYyAgICAgICAgICAgICAg ICAgICAgICAgfCAzMyArKysrKysrKysrKysrKysrKystLS0tCj4gICBkcml2ZXJzL3VzYi9ob3N0 L3hoY2kuaCAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAzICstCj4gICAzIGZpbGVzIGNo YW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBh L0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy91c2IvdXNiLXhoY2kudHh0IGIvRG9j dW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL3VzYi91c2IteGhjaS50eHQKPiBpbmRleCBl MmVhNTliYmNhOTMuLmU0YjE0NTExZjRmOCAxMDA2NDQKPiAtLS0gYS9Eb2N1bWVudGF0aW9uL2Rl dmljZXRyZWUvYmluZGluZ3MvdXNiL3VzYi14aGNpLnR4dAo+ICsrKyBiL0RvY3VtZW50YXRpb24v ZGV2aWNldHJlZS9iaW5kaW5ncy91c2IvdXNiLXhoY2kudHh0Cj4gQEAgLTI3LDcgKzI3LDEwIEBA IFJlcXVpcmVkIHByb3BlcnRpZXM6Cj4gICAgIC0gaW50ZXJydXB0czogb25lIFhIQ0kgaW50ZXJy dXB0IHNob3VsZCBiZSBkZXNjcmliZWQgaGVyZS4KPiAgIAo+ICAgT3B0aW9uYWwgcHJvcGVydGll czoKPiAtICAtIGNsb2NrczogcmVmZXJlbmNlIHRvIGEgY2xvY2sKPiArICAtIGNsb2NrczogcmVm ZXJlbmNlIHRvIHRoZSBjbG9ja3MKPiArICAtIGNsb2NrLW5hbWVzOiBtYW5kYXRvcnkgaWYgdGhl cmUgaXMgYSBzZWNvbmQgY2xvY2ssIGluIHRoaXMgY2FzZQo+ICsgICAgdGhlIG5hbWUgbXVzdCBi ZSAiY29yZSIgZm9yIHRoZSBmaXJzdCBjbG9jayBhbmQgInJlZyIgZm9yIHRoZQo+ICsgICAgc2Vj b25kIG9uZQo+ICAgICAtIHVzYjItbHBtLWRpc2FibGU6IGluZGljYXRlIGlmIHdlIGRvbid0IHdh bnQgdG8gZW5hYmxlIFVTQjIgSFcgTFBNCj4gICAgIC0gdXNiMy1scG0tY2FwYWJsZTogZGV0ZXJt aW5lcyBpZiBwbGF0Zm9ybSBpcyBVU0IzIExQTSBjYXBhYmxlCj4gICAgIC0gcXVpcmstYnJva2Vu LXBvcnQtcGVkOiBzZXQgaWYgdGhlIGNvbnRyb2xsZXIgaGFzIGJyb2tlbiBwb3J0IGRpc2FibGUg bWVjaGFuaXNtCgpXb3VsZCBiZSBnb29kIHRvIGdldCBhIEFjayBvciByZXZpZXcgYnkgUm9iIEhl cnJpbmcgZm9yIHRoZSBhYm92ZQoKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvaG9zdC94aGNp LXBsYXQuYyBiL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1wbGF0LmMKPiBpbmRleCA3OWFmYWFjNTdl ZjYuLmZkMGMzOTkwMTNhMiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktcGxh dC5jCj4gKysrIGIvZHJpdmVycy91c2IvaG9zdC94aGNpLXBsYXQuYwo+IEBAIC0xNTcsNiArMTU3 LDcgQEAgc3RhdGljIGludCB4aGNpX3BsYXRfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAq cGRldikKPiAgIAlzdHJ1Y3QgcmVzb3VyY2UgICAgICAgICAqcmVzOwo+ICAgCXN0cnVjdCB1c2Jf aGNkCQkqaGNkOwo+ICAgCXN0cnVjdCBjbGsgICAgICAgICAgICAgICpjbGs7Cj4gKwlzdHJ1Y3Qg Y2xrICAgICAgICAgICAgICAqcmVnX2NsazsKPiAgIAlpbnQJCQlyZXQ7Cj4gICAJaW50CQkJaXJx Owo+ICAgCj4gQEAgLTIyNiwxNyArMjI3LDI3IEBAIHN0YXRpYyBpbnQgeGhjaV9wbGF0X3Byb2Jl KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCj4gICAJaGNkLT5yc3JjX2xlbiA9IHJlc291 cmNlX3NpemUocmVzKTsKPiAgIAo+ICAgCS8qCj4gLQkgKiBOb3QgYWxsIHBsYXRmb3JtcyBoYXZl IGEgY2xrIHNvIGl0IGlzIG5vdCBhbiBlcnJvciBpZiB0aGUKPiAtCSAqIGNsb2NrIGRvZXMgbm90 IGV4aXN0cy4KPiArCSAqIE5vdCBhbGwgcGxhdGZvcm1zIGhhdmUgY2xrcyBzbyBpdCBpcyBub3Qg YW4gZXJyb3IgaWYgdGhlCj4gKwkgKiBjbG9jayBkbyBub3QgZXhpc3QuCj4gICAJICovCj4gKwly ZWdfY2xrID0gZGV2bV9jbGtfZ2V0KCZwZGV2LT5kZXYsICJyZWciKTsKPiArCWlmICghSVNfRVJS KHJlZ19jbGspKSB7Cj4gKwkJcmV0ID0gY2xrX3ByZXBhcmVfZW5hYmxlKHJlZ19jbGspOwo+ICsJ CWlmIChyZXQpCj4gKwkJCWdvdG8gcHV0X2hjZDsKPiArCX0gZWxzZSBpZiAoUFRSX0VSUihyZWdf Y2xrKSA9PSAtRVBST0JFX0RFRkVSKSB7Cj4gKwkJcmV0ID0gLUVQUk9CRV9ERUZFUjsKPiArCQln b3RvIHB1dF9oY2Q7Cj4gKwl9Cj4gKwo+ICAgCWNsayA9IGRldm1fY2xrX2dldCgmcGRldi0+ZGV2 LCBOVUxMKTsKPiAgIAlpZiAoIUlTX0VSUihjbGspKSB7Cj4gICAJCXJldCA9IGNsa19wcmVwYXJl X2VuYWJsZShjbGspOwo+ICAgCQlpZiAocmV0KQo+IC0JCQlnb3RvIHB1dF9oY2Q7Cj4gKwkJCWdv dG8gZGlzYWJsZV9yZWdfY2xrOwo+ICAgCX0gZWxzZSBpZiAoUFRSX0VSUihjbGspID09IC1FUFJP QkVfREVGRVIpIHsKPiAgIAkJcmV0ID0gLUVQUk9CRV9ERUZFUjsKPiAtCQlnb3RvIHB1dF9oY2Q7 Cj4gKwkJZ290byBkaXNhYmxlX3JlZ19jbGs7Cj4gICAJfQo+ICAgCj4gICAJeGhjaSA9IGhjZF90 b194aGNpKGhjZCk7Cj4gQEAgLTI1Miw2ICsyNjMsNyBAQCBzdGF0aWMgaW50IHhoY2lfcGxhdF9w cm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQo+ICAgCWRldmljZV93YWtldXBfZW5h YmxlKGhjZC0+c2VsZi5jb250cm9sbGVyKTsKPiAgIAo+ICAgCXhoY2ktPmNsayA9IGNsazsKPiAr CXhoY2ktPnJlZ19jbGsgPSByZWdfY2xrOwo+ICAgCXhoY2ktPm1haW5faGNkID0gaGNkOwo+ICAg CXhoY2ktPnNoYXJlZF9oY2QgPSBfX3VzYl9jcmVhdGVfCgpoY2QoZHJpdmVyLCBzeXNkZXYsICZw ZGV2LT5kZXYsCj4gICAJCQlkZXZfbmFtZSgmcGRldi0+ZGV2KSwgaGNkKTsKPiBAQCAtMzIxLDYg KzMzMyw5IEBAIHN0YXRpYyBpbnQgeGhjaV9wbGF0X3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZp Y2UgKnBkZXYpCj4gICBkaXNhYmxlX2NsazoKPiAgIAljbGtfZGlzYWJsZV91bnByZXBhcmUoY2xr KTsKPiAgIAo+ICtkaXNhYmxlX3JlZ19jbGs6Cj4gKwljbGtfZGlzYWJsZV91bnByZXBhcmUocmVn X2Nsayk7Cj4gKwo+ICAgcHV0X2hjZDoKPiAgIAl1c2JfcHV0X2hjZChoY2QpOwo+ICAgCj4gQEAg LTMzNiw2ICszNTEsNyBAQCBzdGF0aWMgaW50IHhoY2lfcGxhdF9yZW1vdmUoc3RydWN0IHBsYXRm b3JtX2RldmljZSAqZGV2KQo+ICAgCXN0cnVjdCB1c2JfaGNkCSpoY2QgPSBwbGF0Zm9ybV9nZXRf ZHJ2ZGF0YShkZXYpOwo+ICAgCXN0cnVjdCB4aGNpX2hjZAkqeGhjaSA9IGhjZF90b194aGNpKGhj ZCk7Cj4gICAJc3RydWN0IGNsayAqY2xrID0geGhjaS0+Y2xrOwo+ICsJc3RydWN0IGNsayAqcmVn X2NsayA9IHhoY2ktPnJlZ19jbGs7Cj4gICAKPiAgIAl4aGNpLT54aGNfc3RhdGUgfD0gWEhDSV9T VEFURV9SRU1PVklORzsKPiAgIAo+IEBAIC0zNDYsNiArMzYyLDcgQEAgc3RhdGljIGludCB4aGNp X3BsYXRfcmVtb3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKmRldikKPiAgIAl1c2JfcHV0X2hj ZCh4aGNpLT5zaGFyZWRfaGNkKTsKPiAgIAo+ICAgCWNsa19kaXNhYmxlX3VucHJlcGFyZShjbGsp Owo+ICsJY2xrX2Rpc2FibGVfdW5wcmVwYXJlKHJlZ19jbGspOwo+ICAgCXVzYl9wdXRfaGNkKGhj ZCk7Cj4gICAKPiAgIAlwbV9ydW50aW1lX3NldF9zdXNwZW5kZWQoJmRldi0+ZGV2KTsKPiBAQCAt MzcwLDggKzM4NywxMCBAQCBzdGF0aWMgaW50IF9fbWF5YmVfdW51c2VkIHhoY2lfcGxhdF9zdXNw ZW5kKHN0cnVjdCBkZXZpY2UgKmRldikKPiAgIAkgKi8KPiAgIAlyZXQgPSB4aGNpX3N1c3BlbmQo eGhjaSwgZGV2aWNlX21heV93YWtldXAoZGV2KSk7Cj4gICAKPiAtCWlmICghZGV2aWNlX21heV93 YWtldXAoZGV2KSAmJiAhSVNfRVJSKHhoY2ktPmNsaykpCj4gKwlpZiAoIWRldmljZV9tYXlfd2Fr ZXVwKGRldikgJiYgIUlTX0VSUih4aGNpLT5jbGspKSB7Cj4gICAJCWNsa19kaXNhYmxlX3VucHJl cGFyZSh4aGNpLT5jbGspOwo+ICsJCWNsa19kaXNhYmxlX3VucHJlcGFyZSh4aGNpLT5yZWdfY2xr KTsKPiArCX0KPiAgIAo+ICAgCXJldHVybiByZXQ7Cj4gICB9Cj4gQEAgLTM4Miw4ICs0MDEsMTAg QEAgc3RhdGljIGludCBfX21heWJlX3VudXNlZCB4aGNpX3BsYXRfcmVzdW1lKHN0cnVjdCBkZXZp Y2UgKmRldikKPiAgIAlzdHJ1Y3QgeGhjaV9oY2QJKnhoY2kgPSBoY2RfdG9feGhjaShoY2QpOwo+ ICAgCWludCByZXQ7Cj4gICAKPiAtCWlmICghZGV2aWNlX21heV93YWtldXAoZGV2KSAmJiAhSVNf RVJSKHhoY2ktPmNsaykpCj4gKwlpZiAoIWRldmljZV9tYXlfd2FrZXVwKGRldikgJiYgIUlTX0VS Uih4aGNpLT5jbGspKSB7Cj4gKwkJY2xrX3ByZXBhcmVfZW5hYmxlKHhoY2ktPnJlZ19jbGspOwo+ ICAgCQljbGtfcHJlcGFyZV9lbmFibGUoeGhjaS0+Y2xrKTsKPiArCX0KPiAgIAo+ICAgCXJldCA9 IHhoY2lfcHJpdl9yZXN1bWVfcXVpcmsoaGNkKTsKPiAgIAlpZiAocmV0KQo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL3VzYi9ob3N0L3hoY2kuaCBiL2RyaXZlcnMvdXNiL2hvc3QveGhjaS5oCj4gaW5k ZXggOTYwOTlhMjQ1YzY5Li45ODg0YWFiYTFiNDAgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy91c2Iv aG9zdC94aGNpLmgKPiArKysgYi9kcml2ZXJzL3VzYi9ob3N0L3hoY2kuaAo+IEBAIC0xNzI2LDgg KzE3MjYsOSBAQCBzdHJ1Y3QgeGhjaV9oY2Qgewo+ICAgCWludAkJcGFnZV9zaGlmdDsKPiAgIAkv KiBtc2kteCB2ZWN0b3JzICovCj4gICAJaW50CQltc2l4X2NvdW50Owo+IC0JLyogb3B0aW9uYWwg Y2xvY2sgKi8KPiArCS8qIG9wdGlvbmFsIGNsb2NrcyAqLwo+ICAgCXN0cnVjdCBjbGsJCSpjbGs7 Cj4gKwlzdHJ1Y3QgY2xrCQkqcmVnX2NsazsKPiAgIAkvKiBkYXRhIHN0cnVjdHVyZXMgKi8KPiAg IAlzdHJ1Y3QgeGhjaV9kZXZpY2VfY29udGV4dF9hcnJheSAqZGNiYWE7Cj4gICAJc3RydWN0IHho Y2lfcmluZwkqY21kX3Jpbmc7Cj4gCgpMb29rcyBnb29kIHRvIG1lLCBJJ2xsIHF1ZXVlIGl0IHVw IGlmIHRoZSBkZXZpY2V0cmVlIGJpbmRpbmdzIGxvb2tzIG9rIGZvciBSb2IgSGVycmluZwoKLU1h dGhpYXMKLS0tClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1 bnN1YnNjcmliZSBsaW51eC11c2IiIGluCnRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRv bW9Admdlci5rZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtl cm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: mathias.nyman@intel.com (Mathias Nyman) Date: Wed, 28 Feb 2018 18:05:20 +0200 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: <0643f36a-cee7-8e4a-77c3-c60672ca385f@intel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 14.02.2018 18:16, 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 Would be good to get a Ack or review by Rob Herring for the above > 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; > + } > + > clk = devm_clk_get(&pdev->dev, NULL); > if (!IS_ERR(clk)) { > ret = clk_prepare_enable(clk); > if (ret) > - goto put_hcd; > + goto disable_reg_clk; > } else if (PTR_ERR(clk) == -EPROBE_DEFER) { > ret = -EPROBE_DEFER; > - goto put_hcd; > + goto disable_reg_clk; > } > > xhci = hcd_to_xhci(hcd); > @@ -252,6 +263,7 @@ static int xhci_plat_probe(struct platform_device *pdev) > device_wakeup_enable(hcd->self.controller); > > xhci->clk = clk; > + xhci->reg_clk = reg_clk; > xhci->main_hcd = hcd; > xhci->shared_hcd = __usb_create_ hcd(driver, sysdev, &pdev->dev, > dev_name(&pdev->dev), hcd); > @@ -321,6 +333,9 @@ static int xhci_plat_probe(struct platform_device *pdev) > disable_clk: > clk_disable_unprepare(clk); > > +disable_reg_clk: > + clk_disable_unprepare(reg_clk); > + > put_hcd: > usb_put_hcd(hcd); > > @@ -336,6 +351,7 @@ static int xhci_plat_remove(struct platform_device *dev) > struct usb_hcd *hcd = platform_get_drvdata(dev); > struct xhci_hcd *xhci = hcd_to_xhci(hcd); > struct clk *clk = xhci->clk; > + struct clk *reg_clk = xhci->reg_clk; > > xhci->xhc_state |= XHCI_STATE_REMOVING; > > @@ -346,6 +362,7 @@ static int xhci_plat_remove(struct platform_device *dev) > usb_put_hcd(xhci->shared_hcd); > > clk_disable_unprepare(clk); > + clk_disable_unprepare(reg_clk); > usb_put_hcd(hcd); > > pm_runtime_set_suspended(&dev->dev); > @@ -370,8 +387,10 @@ static int __maybe_unused xhci_plat_suspend(struct device *dev) > */ > ret = xhci_suspend(xhci, device_may_wakeup(dev)); > > - if (!device_may_wakeup(dev) && !IS_ERR(xhci->clk)) > + if (!device_may_wakeup(dev) && !IS_ERR(xhci->clk)) { > clk_disable_unprepare(xhci->clk); > + clk_disable_unprepare(xhci->reg_clk); > + } > > return ret; > } > @@ -382,8 +401,10 @@ static int __maybe_unused xhci_plat_resume(struct device *dev) > struct xhci_hcd *xhci = hcd_to_xhci(hcd); > int ret; > > - if (!device_may_wakeup(dev) && !IS_ERR(xhci->clk)) > + if (!device_may_wakeup(dev) && !IS_ERR(xhci->clk)) { > + clk_prepare_enable(xhci->reg_clk); > clk_prepare_enable(xhci->clk); > + } > > ret = xhci_priv_resume_quirk(hcd); > if (ret) > diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h > index 96099a245c69..9884aaba1b40 100644 > --- a/drivers/usb/host/xhci.h > +++ b/drivers/usb/host/xhci.h > @@ -1726,8 +1726,9 @@ struct xhci_hcd { > int page_shift; > /* msi-x vectors */ > int msix_count; > - /* optional clock */ > + /* optional clocks */ > struct clk *clk; > + struct clk *reg_clk; > /* data structures */ > struct xhci_device_context_array *dcbaa; > struct xhci_ring *cmd_ring; > Looks good to me, I'll queue it up if the devicetree bindings looks ok for Rob Herring -Mathias