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: dmaengine: mv_xor_v2: Fix clock resource by adding a register clock From: Vinod Koul Message-Id: <20180301082554.GE15443@localhost> Date: Thu, 1 Mar 2018 13:55:54 +0530 To: Gregory CLEMENT Cc: dmaengine@vger.kernel.org, Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Thomas Petazzoni , linux-arm-kernel@lists.infradead.org, Antoine Tenart , =?iso-8859-1?Q?Miqu=E8l?= Raynal , Nadav Haklai , Shadi Ammouri , Omri Itach , Hanna Hawa , Igal Liberman , Marcin Wojtas , Rob Herring List-ID: T24gVHVlLCBGZWIgMjcsIDIwMTggYXQgMDQ6MTk6NTZQTSArMDEwMCwgR3JlZ29yeSBDTEVNRU5U IHdyb3RlOgo+IEhpIFZpbm9kLAo+ICAKPiAgT24gbWFyLiwgZsOpdnIuIDI3IDIwMTgsIFZpbm9k IEtvdWwgPHZpbm9kLmtvdWxAaW50ZWwuY29tPiB3cm90ZToKPiAKPiA+IFBscyBkbyBDQyBEVCBm b2xrcyBhbmQgUm9iIGZvciBiaW5kaW5ncyB1cGRhdGUKPiA+Cj4gPiBPbiBXZWQsIEZlYiAxNCwg MjAxOCBhdCAwNToyNzozM1BNICswMTAwLCBHcmVnb3J5IENMRU1FTlQgd3JvdGU6Cj4gPj4gT24g dGhlIENQMTEwIGNvbXBvbmVudHMgd2hpYyBhcmUgcHJlc2VudCBvbiB0aGUgQXJtYWRhIDdLLzhL IFNvQyB3ZSBuZWVkCj4gPgo+ID4gL3Mvd2hpYy93aGljaAo+ID4KPiA+PiB0byBleHBsaWNpdGx5 IGVuYWJsZSB0aGUgcmVnaXN0ZXJzIGNsb2NrLiBIb3dldmVyIGl0IGlzIG5vdCBuZWVkZWQgZm9y Cj4gPgo+ID4gL3MvcmVnaXN0ZXJzL3JlZ2lzdGVyCj4gPgo+ID4+IHRoZSBBUDh4eCBjb21wb25l bmV0LCB0aGF0J3Mgd2h5IHRoaXMgY2xvY2sgaXMgb3B0aW9uYWwuCj4gPj4gCj4gPj4gU2lnbmVk LW9mZi1ieTogR3JlZ29yeSBDTEVNRU5UIDxncmVnb3J5LmNsZW1lbnRAYm9vdGxpbi5jb20+Cj4g Pj4gLS0tCj4gPj4gIC4uLi9kZXZpY2V0cmVlL2JpbmRpbmdzL2RtYS9tdi14b3ItdjIudHh0ICAg ICAgICAgIHwgIDYgKysrKystCj4gPj4gIGRyaXZlcnMvZG1hL212X3hvcl92Mi5jICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHwgMjMgKysrKysrKysrKysrKysrKystLS0tLQo+ID4+ICAyIGZp bGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCj4gPj4gCj4gPj4g ZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9kbWEvbXYteG9y LXYyLnR4dCBiL0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9kbWEvbXYteG9yLXYy LnR4dAo+ID4+IGluZGV4IDIxN2E5MGVhYWJlNy4uOWMzOGJiZTdlNmQ3IDEwMDY0NAo+ID4+IC0t LSBhL0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9kbWEvbXYteG9yLXYyLnR4dAo+ ID4+ICsrKyBiL0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9kbWEvbXYteG9yLXYy LnR4dAo+ID4+IEBAIC0xMSw3ICsxMSwxMSBAQCBSZXF1aXJlZCBwcm9wZXJ0aWVzOgo+ID4+ICAg IGludGVycnVwdHMuCj4gPj4gIAo+ID4+ICBPcHRpb25hbCBwcm9wZXJ0aWVzOgo+ID4+IC0tIGNs b2NrczogT3B0aW9uYWwgcmVmZXJlbmNlIHRvIHRoZSBjbG9jayB1c2VkIGJ5IHRoZSBYT1IgZW5n aW5lLgo+ID4+ICstIGNsb2NrczogT3B0aW9uYWwgcmVmZXJlbmNlIHRvIHRoZSBjbG9ja3MgdXNl ZCBieSB0aGUgWE9SIGVuZ2luZS4KPiA+PiArLSBjbG9jay1uYW1lczogbWFuZGF0b3J5IGlmIHRo ZXJlIGlzIGEgc2Vjb25kIGNsb2NrLCBpbiB0aGlzIGNhc2UgdGhlCj4gPj4gKyAgIG5hbWUgbXVz dCBiZSAiY29yZSIgZm9yIHRoZSBmaXJzdCBjbG9jayBhbmQgInJlZyIgZm9yIHRoZSBzZWNvbmQK PiA+PiArICAgb25lCj4gPj4gKwo+ID4+ICAKPiA+PiAgRXhhbXBsZToKPiA+PiAgCj4gPj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZG1hL212X3hvcl92Mi5jIGIvZHJpdmVycy9kbWEvbXZfeG9yX3Yy LmMKPiA+PiBpbmRleCBmNjUyYTBlMGY1YTIuLjkzYjNkODBjZTcwMSAxMDA2NDQKPiA+PiAtLS0g YS9kcml2ZXJzL2RtYS9tdl94b3JfdjIuYwo+ID4+ICsrKyBiL2RyaXZlcnMvZG1hL212X3hvcl92 Mi5jCj4gPj4gQEAgLTE2Myw2ICsxNjMsNyBAQCBzdHJ1Y3QgbXZfeG9yX3YyX2RldmljZSB7Cj4g Pj4gIAl2b2lkIF9faW9tZW0gKmRtYV9iYXNlOwo+ID4+ICAJdm9pZCBfX2lvbWVtICpnbG9iX2Jh c2U7Cj4gPj4gIAlzdHJ1Y3QgY2xrICpjbGs7Cj4gPj4gKwlzdHJ1Y3QgY2xrICpyZWdfY2xrOwo+ ID4+ICAJc3RydWN0IHRhc2tsZXRfc3RydWN0IGlycV90YXNrbGV0Owo+ID4+ICAJc3RydWN0IGxp c3RfaGVhZCBmcmVlX3N3X2Rlc2M7Cj4gPj4gIAlzdHJ1Y3QgZG1hX2RldmljZSBkbWFkZXY7Cj4g Pj4gQEAgLTc0OSwxMyArNzUwLDI0IEBAIHN0YXRpYyBpbnQgbXZfeG9yX3YyX3Byb2JlKHN0cnVj dCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCj4gPj4gIAlpZiAocmV0KQo+ID4+ICAJCXJldHVybiBy ZXQ7Cj4gPj4gIAo+ID4+IC0JeG9yX2Rldi0+Y2xrID0gZGV2bV9jbGtfZ2V0KCZwZGV2LT5kZXYs IE5VTEwpOwo+ID4+IC0JaWYgKElTX0VSUih4b3JfZGV2LT5jbGspICYmIFBUUl9FUlIoeG9yX2Rl di0+Y2xrKSA9PSAtRVBST0JFX0RFRkVSKQo+ID4+ICsJeG9yX2Rldi0+cmVnX2NsayA9IGRldm1f Y2xrX2dldCgmcGRldi0+ZGV2LCAicmVnIik7Cj4gPgo+ID4gaXMgdGhpcyBhbiBleGl0aW5nIHBy b3BlcnR5Pwo+IAo+IEl0IGlzIHRoZSBuYW1lIG9mIHRoZSBuZXcgb3B0aW9uYWwgY2xvY2sgZGVz Y3JpYmVkIGluIHRoZSBmaXJzdCBwYXJ0IG9mCj4gdGhpcyBwYXRjaC4KCm9rYXkgSSBhbSBtaXNz aW5nIHNvbWV0aGluZyB0aGVuLCB5b3UgYXJlIHJlYWRpbmcgInJlZyIgYnV0IHByb3BlcnR5IGFk ZGVkIGlzCiJjbG9jay1uYW1lcyIsIHdoZXJlIGFyZSB5b3UgcmVhZGluZyB0aGlzPwoKPiAKPiBB Ym91dCB0aGUgdHlwbywgZG8geW91IG5lZWQgYSBuZXcgdmVyc2lvbiBvciBkbyB5b3UgcGxhbiB0 byBmaXggdGhlbQo+IHdoaWxlIGFwcGx5aW5nIHRoZSBwYXRjaD8KPiAKPiBUaGFua3MsCj4gCj4g R3JlZ29yeQo+IAo+IAo+ID4KPiA+PiArCWlmICghSVNfRVJSKHhvcl9kZXYtPnJlZ19jbGspKSB7 Cj4gPj4gKwkJcmV0ID0gY2xrX3ByZXBhcmVfZW5hYmxlKHhvcl9kZXYtPnJlZ19jbGspOwo+ID4+ ICsJCWlmIChyZXQpCj4gPj4gKwkJCXJldHVybiByZXQ7Cj4gPj4gKwl9IGVsc2UgaWYgKFBUUl9F UlIoeG9yX2Rldi0+cmVnX2NsaykgPT0gLUVQUk9CRV9ERUZFUikgewo+ID4+ICAJCXJldHVybiAt RVBST0JFX0RFRkVSOwo+ID4+ICsJfQo+ID4+ICsKPiA+PiArCXhvcl9kZXYtPmNsayA9IGRldm1f Y2xrX2dldCgmcGRldi0+ZGV2LCBOVUxMKTsKPiA+PiArCWlmIChJU19FUlIoeG9yX2Rldi0+Y2xr KSAmJiBQVFJfRVJSKHhvcl9kZXYtPmNsaykgPT0gLUVQUk9CRV9ERUZFUikgewo+ID4+ICsJCXJl dCA9IEVQUk9CRV9ERUZFUjsKPiA+PiArCQlnb3RvIGRpc2FibGVfcmVnX2NsazsKPiA+PiArCX0K PiA+PiAgCWlmICghSVNfRVJSKHhvcl9kZXYtPmNsaykpIHsKPiA+PiAgCQlyZXQgPSBjbGtfcHJl cGFyZV9lbmFibGUoeG9yX2Rldi0+Y2xrKTsKPiA+PiAgCQlpZiAocmV0KQo+ID4+IC0JCQlyZXR1 cm4gcmV0Owo+ID4+ICsJCQlnb3RvIGRpc2FibGVfcmVnX2NsazsKPiA+PiAgCX0KPiA+PiAgCj4g Pj4gIAlyZXQgPSBwbGF0Zm9ybV9tc2lfZG9tYWluX2FsbG9jX2lycXMoJnBkZXYtPmRldiwgMSwK PiA+PiBAQCAtODY2LDggKzg3OCw5IEBAIHN0YXRpYyBpbnQgbXZfeG9yX3YyX3Byb2JlKHN0cnVj dCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCj4gPj4gIGZyZWVfbXNpX2lycXM6Cj4gPj4gIAlwbGF0 Zm9ybV9tc2lfZG9tYWluX2ZyZWVfaXJxcygmcGRldi0+ZGV2KTsKPiA+PiAgZGlzYWJsZV9jbGs6 Cj4gPj4gLQlpZiAoIUlTX0VSUih4b3JfZGV2LT5jbGspKQo+ID4+IC0JCWNsa19kaXNhYmxlX3Vu cHJlcGFyZSh4b3JfZGV2LT5jbGspOwo+ID4+ICsJY2xrX2Rpc2FibGVfdW5wcmVwYXJlKHhvcl9k ZXYtPmNsayk7Cj4gPj4gK2Rpc2FibGVfcmVnX2NsazoKPiA+PiArCWNsa19kaXNhYmxlX3VucHJl cGFyZSh4b3JfZGV2LT5yZWdfY2xrKTsKPiA+PiAgCXJldHVybiByZXQ7Cj4gPj4gIH0KPiA+PiAg Cj4gPj4gLS0gCj4gPj4gMi4xNS4xCj4gPj4gCj4gPgo+ID4gLS0gCj4gPiB+Vmlub2QKPiA+IC0t Cj4gPiBUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDogc2VuZCB0aGUgbGluZSAidW5zdWJz Y3JpYmUgZG1hZW5naW5lIiBpbgo+ID4gdGhlIGJvZHkgb2YgYSBtZXNzYWdlIHRvIG1ham9yZG9t b0B2Z2VyLmtlcm5lbC5vcmcKPiA+IE1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2Vy Lmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbAo+IAo+IC0tIAo+IEdyZWdvcnkgQ2xlbWVu dCwgQm9vdGxpbiAoZm9ybWVybHkgRnJlZSBFbGVjdHJvbnMpCj4gRW1iZWRkZWQgTGludXggYW5k IEtlcm5lbCBlbmdpbmVlcmluZwo+IGh0dHA6Ly9ib290bGluLmNvbQo+IC0tCj4gVG8gdW5zdWJz Y3JpYmUgZnJvbSB0aGlzIGxpc3Q6IHNlbmQgdGhlIGxpbmUgInVuc3Vic2NyaWJlIGRtYWVuZ2lu ZSIgaW4KPiB0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZnZXIua2VybmVsLm9y Zwo+IE1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jk b21vLWluZm8uaHRtbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: vinod.koul@intel.com (Vinod Koul) Date: Thu, 1 Mar 2018 13:55:54 +0530 Subject: [PATCH] dmaengine: mv_xor_v2: Fix clock resource by adding a register clock In-Reply-To: <87vaeijw83.fsf@bootlin.com> References: <20180214162733.4591-1-gregory.clement@bootlin.com> <20180227151511.GC15443@localhost> <87vaeijw83.fsf@bootlin.com> Message-ID: <20180301082554.GE15443@localhost> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, Feb 27, 2018 at 04:19:56PM +0100, Gregory CLEMENT wrote: > Hi Vinod, > > On mar., f?vr. 27 2018, Vinod Koul wrote: > > > Pls do CC DT folks and Rob for bindings update > > > > On Wed, Feb 14, 2018 at 05:27:33PM +0100, Gregory CLEMENT wrote: > >> On the CP110 components whic are present on the Armada 7K/8K SoC we need > > > > /s/whic/which > > > >> to explicitly enable the registers clock. However it is not needed for > > > > /s/registers/register > > > >> the AP8xx componenet, that's why this clock is optional. > >> > >> Signed-off-by: Gregory CLEMENT > >> --- > >> .../devicetree/bindings/dma/mv-xor-v2.txt | 6 +++++- > >> drivers/dma/mv_xor_v2.c | 23 +++++++++++++++++----- > >> 2 files changed, 23 insertions(+), 6 deletions(-) > >> > >> diff --git a/Documentation/devicetree/bindings/dma/mv-xor-v2.txt b/Documentation/devicetree/bindings/dma/mv-xor-v2.txt > >> index 217a90eaabe7..9c38bbe7e6d7 100644 > >> --- a/Documentation/devicetree/bindings/dma/mv-xor-v2.txt > >> +++ b/Documentation/devicetree/bindings/dma/mv-xor-v2.txt > >> @@ -11,7 +11,11 @@ Required properties: > >> interrupts. > >> > >> Optional properties: > >> -- clocks: Optional reference to the clock used by the XOR engine. > >> +- clocks: Optional reference to the clocks used by the XOR engine. > >> +- 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 > >> + > >> > >> Example: > >> > >> diff --git a/drivers/dma/mv_xor_v2.c b/drivers/dma/mv_xor_v2.c > >> index f652a0e0f5a2..93b3d80ce701 100644 > >> --- a/drivers/dma/mv_xor_v2.c > >> +++ b/drivers/dma/mv_xor_v2.c > >> @@ -163,6 +163,7 @@ struct mv_xor_v2_device { > >> void __iomem *dma_base; > >> void __iomem *glob_base; > >> struct clk *clk; > >> + struct clk *reg_clk; > >> struct tasklet_struct irq_tasklet; > >> struct list_head free_sw_desc; > >> struct dma_device dmadev; > >> @@ -749,13 +750,24 @@ static int mv_xor_v2_probe(struct platform_device *pdev) > >> if (ret) > >> return ret; > >> > >> - xor_dev->clk = devm_clk_get(&pdev->dev, NULL); > >> - if (IS_ERR(xor_dev->clk) && PTR_ERR(xor_dev->clk) == -EPROBE_DEFER) > >> + xor_dev->reg_clk = devm_clk_get(&pdev->dev, "reg"); > > > > is this an exiting property? > > It is the name of the new optional clock described in the first part of > this patch. okay I am missing something then, you are reading "reg" but property added is "clock-names", where are you reading this? > > About the typo, do you need a new version or do you plan to fix them > while applying the patch? > > Thanks, > > Gregory > > > > > >> + if (!IS_ERR(xor_dev->reg_clk)) { > >> + ret = clk_prepare_enable(xor_dev->reg_clk); > >> + if (ret) > >> + return ret; > >> + } else if (PTR_ERR(xor_dev->reg_clk) == -EPROBE_DEFER) { > >> return -EPROBE_DEFER; > >> + } > >> + > >> + xor_dev->clk = devm_clk_get(&pdev->dev, NULL); > >> + if (IS_ERR(xor_dev->clk) && PTR_ERR(xor_dev->clk) == -EPROBE_DEFER) { > >> + ret = EPROBE_DEFER; > >> + goto disable_reg_clk; > >> + } > >> if (!IS_ERR(xor_dev->clk)) { > >> ret = clk_prepare_enable(xor_dev->clk); > >> if (ret) > >> - return ret; > >> + goto disable_reg_clk; > >> } > >> > >> ret = platform_msi_domain_alloc_irqs(&pdev->dev, 1, > >> @@ -866,8 +878,9 @@ static int mv_xor_v2_probe(struct platform_device *pdev) > >> free_msi_irqs: > >> platform_msi_domain_free_irqs(&pdev->dev); > >> disable_clk: > >> - if (!IS_ERR(xor_dev->clk)) > >> - clk_disable_unprepare(xor_dev->clk); > >> + clk_disable_unprepare(xor_dev->clk); > >> +disable_reg_clk: > >> + clk_disable_unprepare(xor_dev->reg_clk); > >> return ret; > >> } > >> > >> -- > >> 2.15.1 > >> > > > > -- > > ~Vinod > > -- > > To unsubscribe from this list: send the line "unsubscribe dmaengine" in > > the body of a message to majordomo at vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- > Gregory Clement, Bootlin (formerly Free Electrons) > Embedded Linux and Kernel engineering > http://bootlin.com > -- > To unsubscribe from this list: send the line "unsubscribe dmaengine" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- ~Vinod