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: Gregory CLEMENT Message-Id: <87zi3tdqvn.fsf@bootlin.com> Date: Wed, 28 Feb 2018 17:24:12 +0100 To: Manu Gautam Cc: Greg Kroah-Hartman , Mathias Nyman , linux-usb@vger.kernel.org, Andrew Lunn , Jason Cooper , Antoine Tenart , Hanna Hawa , Omri Itach , Nadav Haklai , Shadi Ammouri , Igal Liberman , Thomas Petazzoni , =?utf-8?Q?Miqu=C3=A8l?= Raynal , Marcin Wojtas , linux-arm-kernel@lists.infradead.org, Sebastian Hesselbarth List-ID: SGkgTWFudSwKIAogT24gbWVyLiwgZsOpdnIuIDI4IDIwMTgsIE1hbnUgR2F1dGFtIDxtZ2F1dGFt QGNvZGVhdXJvcmEub3JnPiB3cm90ZToKCj4gSGksCj4KPgo+IE9uIDIvMTQvMjAxOCA5OjQ2IFBN LCBHcmVnb3J5IENMRU1FTlQgd3JvdGU6Cj4+IE9uIEFybWFkYSA3Sy84SyB3ZSBuZWVkIHRvIGV4 cGxpY2l0bHkgZW5hYmxlIHRoZSByZWdpc3RlciBjbG9jay4gVGhpcwo+PiBjbG9jayBpcyBvcHRp b25hbCBiZWNhdXNlIG5vdCBhbGwgdGhlIFNvQ3MgdXNpbmcgdGhpcyBJUCBuZWVkIGl0IGJ1dCBh dAo+PiBsZWFzdCBmb3IgQXJtYWRhIDdLLzhLIGl0IGlzIGFjdHVhbGx5IG1hbmRhdG9yeS4KPj4K Pj4gVGhlIGNoYW5nZSB3YXMgZG9uZSBhdCB4aGNpLXBsYXQgbGV2ZWwgYW5kIG5vdCBhdCBhIHho Y2ktbXZlYnUuYyBiZWNhdXNlLAo+PiBpdCBpcyBleHBlY3RlZCB0aGF0IG90aGVyIFNvQyB3b3Vs ZCBoYXZlIHRoaXMga2luZCBvZiBjb25zdHJhaW50Lgo+Pgo+PiBUaGUgYmluZGluZyBkb2N1bWVu dGF0aW9uIGlzIHVwZGF0aW5nIGFjY29yZGluZ2x5Lgo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBHcmVn b3J5IENMRU1FTlQgPGdyZWdvcnkuY2xlbWVudEBib290bGluLmNvbT4KPj4gLS0tCj4+ICBEb2N1 bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3MvdXNiL3VzYi14aGNpLnR4dCB8ICA1ICsrKy0K Pj4gIGRyaXZlcnMvdXNiL2hvc3QveGhjaS1wbGF0LmMgICAgICAgICAgICAgICAgICAgICAgIHwg MzMgKysrKysrKysrKysrKysrKysrLS0tLQo+PiAgZHJpdmVycy91c2IvaG9zdC94aGNpLmggICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgMyArLQo+PiAgMyBmaWxlcyBjaGFuZ2VkLCAzMyBp bnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQo+Pgo+PiBkaWZmIC0tZ2l0IGEvRG9jdW1lbnRh dGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL3VzYi91c2IteGhjaS50eHQgYi9Eb2N1bWVudGF0aW9u L2RldmljZXRyZWUvYmluZGluZ3MvdXNiL3VzYi14aGNpLnR4dAo+PiBpbmRleCBlMmVhNTliYmNh OTMuLmU0YjE0NTExZjRmOCAxMDA2NDQKPj4gLS0tIGEvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVl L2JpbmRpbmdzL3VzYi91c2IteGhjaS50eHQKPj4gKysrIGIvRG9jdW1lbnRhdGlvbi9kZXZpY2V0 cmVlL2JpbmRpbmdzL3VzYi91c2IteGhjaS50eHQKPj4gQEAgLTI3LDcgKzI3LDEwIEBAIFJlcXVp cmVkIHByb3BlcnRpZXM6Cj4+ICAgIC0gaW50ZXJydXB0czogb25lIFhIQ0kgaW50ZXJydXB0IHNo b3VsZCBiZSBkZXNjcmliZWQgaGVyZS4KPj4gIAo+PiAgT3B0aW9uYWwgcHJvcGVydGllczoKPj4g LSAgLSBjbG9ja3M6IHJlZmVyZW5jZSB0byBhIGNsb2NrCj4+ICsgIC0gY2xvY2tzOiByZWZlcmVu Y2UgdG8gdGhlIGNsb2Nrcwo+PiArICAtIGNsb2NrLW5hbWVzOiBtYW5kYXRvcnkgaWYgdGhlcmUg aXMgYSBzZWNvbmQgY2xvY2ssIGluIHRoaXMgY2FzZQo+PiArICAgIHRoZSBuYW1lIG11c3QgYmUg ImNvcmUiIGZvciB0aGUgZmlyc3QgY2xvY2sgYW5kICJyZWciIGZvciB0aGUKPj4gKyAgICBzZWNv bmQgb25lCj4+ICAgIC0gdXNiMi1scG0tZGlzYWJsZTogaW5kaWNhdGUgaWYgd2UgZG9uJ3Qgd2Fu dCB0byBlbmFibGUgVVNCMiBIVyBMUE0KPj4gICAgLSB1c2IzLWxwbS1jYXBhYmxlOiBkZXRlcm1p bmVzIGlmIHBsYXRmb3JtIGlzIFVTQjMgTFBNIGNhcGFibGUKPj4gICAgLSBxdWlyay1icm9rZW4t cG9ydC1wZWQ6IHNldCBpZiB0aGUgY29udHJvbGxlciBoYXMgYnJva2VuIHBvcnQgZGlzYWJsZSBt ZWNoYW5pc20KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1wbGF0LmMgYi9k cml2ZXJzL3VzYi9ob3N0L3hoY2ktcGxhdC5jCj4+IGluZGV4IDc5YWZhYWM1N2VmNi4uZmQwYzM5 OTAxM2EyIDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJzL3VzYi9ob3N0L3hoY2ktcGxhdC5jCj4+ICsr KyBiL2RyaXZlcnMvdXNiL2hvc3QveGhjaS1wbGF0LmMKPj4gQEAgLTE1Nyw2ICsxNTcsNyBAQCBz dGF0aWMgaW50IHhoY2lfcGxhdF9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQo+ PiAgCXN0cnVjdCByZXNvdXJjZSAgICAgICAgICpyZXM7Cj4+ICAJc3RydWN0IHVzYl9oY2QJCSpo Y2Q7Cj4+ICAJc3RydWN0IGNsayAgICAgICAgICAgICAgKmNsazsKPj4gKwlzdHJ1Y3QgY2xrICAg ICAgICAgICAgICAqcmVnX2NsazsKPj4gIAlpbnQJCQlyZXQ7Cj4+ICAJaW50CQkJaXJxOwo+PiAg Cj4+IEBAIC0yMjYsMTcgKzIyNywyNyBAQCBzdGF0aWMgaW50IHhoY2lfcGxhdF9wcm9iZShzdHJ1 Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQo+PiAgCWhjZC0+cnNyY19sZW4gPSByZXNvdXJjZV9z aXplKHJlcyk7Cj4+ICAKPj4gIAkvKgo+PiAtCSAqIE5vdCBhbGwgcGxhdGZvcm1zIGhhdmUgYSBj bGsgc28gaXQgaXMgbm90IGFuIGVycm9yIGlmIHRoZQo+PiAtCSAqIGNsb2NrIGRvZXMgbm90IGV4 aXN0cy4KPj4gKwkgKiBOb3QgYWxsIHBsYXRmb3JtcyBoYXZlIGNsa3Mgc28gaXQgaXMgbm90IGFu IGVycm9yIGlmIHRoZQo+PiArCSAqIGNsb2NrIGRvIG5vdCBleGlzdC4KPj4gIAkgKi8KPj4gKwly ZWdfY2xrID0gZGV2bV9jbGtfZ2V0KCZwZGV2LT5kZXYsICJyZWciKTsKPj4gKwlpZiAoIUlTX0VS UihyZWdfY2xrKSkgewo+PiArCQlyZXQgPSBjbGtfcHJlcGFyZV9lbmFibGUocmVnX2Nsayk7Cj4+ ICsJCWlmIChyZXQpCj4+ICsJCQlnb3RvIHB1dF9oY2Q7Cj4+ICsJfSBlbHNlIGlmIChQVFJfRVJS KHJlZ19jbGspID09IC1FUFJPQkVfREVGRVIpIHsKPj4gKwkJcmV0ID0gLUVQUk9CRV9ERUZFUjsK Pj4gKwkJZ290byBwdXRfaGNkOwo+PiArCX0KPj4gKwo+Cj4gSG93IGFib3V0IHVzaW5nIGNsa19i dWxrXyBBUElzPwoKSSBkaWRuJ3Qga25vdyB0aGlzIEFQSSwgYnV0IGFmdGVyIGhhdmluZyBhIGxv b2sgb24gaXQsIGl0IGRpZG4ndCBtYXRjaAp3aGF0IEkgbmVlZC4gSW5kZWVkIHRoZSBzZWNvbmQg Y2xvY2sgaXMgIm9wdGlvbmFsIiB0byBoYW5kbGUgdGhlCmJhY2t3YXJkIGNvbXBhdGliaWxpdHku IFdpdGggdGhlIGNsa19idWxrXyBBUElTIGFsbCB0aGUgY2xvY2tzIGFyZQptYW5kYXRvcnkuCgpU aGFua3MsCgpHcmVnb3J5Cgo+Cj4+ICAJY2xrID0gZGV2bV9jbGtfZ2V0KCZwZGV2LT5kZXYsIE5V TEwpOwo+PiAgCWlmICghSVNfRVJSKGNsaykpIHsKPj4gIAkJcmV0ID0gY2xrX3ByZXBhcmVfZW5h YmxlKGNsayk7Cj4+Cj4KPiAtLSAKPiBUaGUgUXVhbGNvbW0gSW5ub3ZhdGlvbiBDZW50ZXIsIElu Yy4gaXMgYSBtZW1iZXIgb2YgdGhlIENvZGUgQXVyb3JhIEZvcnVtLAo+IGEgTGludXggRm91bmRh dGlvbiBDb2xsYWJvcmF0aXZlIFByb2plY3QKPgo+Cj4gX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KPiBsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdAo+ IGxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwo+IGh0dHA6Ly9saXN0cy5pbmZy YWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: gregory.clement@bootlin.com (Gregory CLEMENT) Date: Wed, 28 Feb 2018 17:24:12 +0100 Subject: [PATCH 2/2] usb: host: xhci-plat: Fix clock resource by adding a register clock In-Reply-To: (Manu Gautam's message of "Wed, 28 Feb 2018 21:39:05 +0530") References: <20180214161620.4401-1-gregory.clement@bootlin.com> <20180214161620.4401-3-gregory.clement@bootlin.com> Message-ID: <87zi3tdqvn.fsf@bootlin.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Manu, On mer., f?vr. 28 2018, Manu Gautam wrote: > 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? I didn't know this API, but after having a look on it, it didn't match what I need. Indeed the second clock is "optional" to handle the backward compatibility. With the clk_bulk_ APIS all the clocks are mandatory. Thanks, Gregory > >> 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 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- Gregory Clement, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering http://bootlin.com