| Message ID | 1459959335-24083-2-git-send-email-appanad@xilinx.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Wed, 2016-04-06 at 21:45:31 +0530, Kedareswara rao Appana wrote: > This patch renames the vdma-mm2s-channel/vdma-s2mm-channel > property with dma-mm2s-channel/dma-s2mm-channel to sync with > the driver. > > Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com> > --- > Changes for v3: > ---> New patch. > > Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt b/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt > index a86737c..762938f 100644 > --- a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt > +++ b/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt > @@ -24,8 +24,8 @@ Optional properties: > {3}, flush s2mm channel > > Required child node properties: > -- compatible: It should be either "xlnx,axi-vdma-mm2s-channel" or > - "xlnx,axi-vdma-s2mm-channel". > +- compatible: It should be either "xlnx,axi-dma-mm2s-channel" or > + "xlnx,axi-dma-s2mm-channel". This change is not backwards compatible and breaks every user of the current binding. Sören -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Soren, > -----Original Message----- > From: Sören Brinkmann [mailto:soren.brinkmann@xilinx.com] > Sent: Wednesday, April 06, 2016 9:50 PM > To: Appana Durga Kedareswara Rao <appanad@xilinx.com> > Cc: robh+dt@kernel.org; pawel.moll@arm.com; mark.rutland@arm.com; > ijc+devicetree@hellion.org.uk; galak@codeaurora.org; Michal Simek > <michals@xilinx.com>; vinod.koul@intel.com; dan.j.williams@intel.com; > Appana Durga Kedareswara Rao <appanad@xilinx.com>; > moritz.fischer@ettus.com; laurent.pinchart@ideasonboard.com; > luis@debethencourt.com; Srikanth Vemula <svemula@xilinx.com>; Anirudha > Sarangi <anirudh@xilinx.com>; devicetree@vger.kernel.org; linux-arm- > kernel@lists.infradead.org; linux-kernel@vger.kernel.org; > dmaengine@vger.kernel.org > Subject: Re: [PATCH v3 1/5] Documentation: DT: vdma: Rename vdma-chan > prefix to dma-chan > > On Wed, 2016-04-06 at 21:45:31 +0530, Kedareswara rao Appana wrote: > > This patch renames the vdma-mm2s-channel/vdma-s2mm-channel > > property with dma-mm2s-channel/dma-s2mm-channel to sync with the > > driver. > > > > Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com> > > --- > > Changes for v3: > > ---> New patch. > > > > Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt | 8 > > ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git > > a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt > > b/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt > > index a86737c..762938f 100644 > > --- a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt > > +++ b/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt > > @@ -24,8 +24,8 @@ Optional properties: > > {3}, flush s2mm channel > > > > Required child node properties: > > -- compatible: It should be either "xlnx,axi-vdma-mm2s-channel" or > > - "xlnx,axi-vdma-s2mm-channel". > > +- compatible: It should be either "xlnx,axi-dma-mm2s-channel" or > > + "xlnx,axi-dma-s2mm-channel". > > This change is not backwards compatible and breaks every user of the current > binding. This commit http://git.kernel.org/cgit/linux/kernel/git/vkoul/slave-dma.git/commit/?h=next&id=8e66e7d682b04f7141f8ae666908c8dcd7fc0bfa Renames xilinx_vdma_ prefix to xilinx_dma which includes renaming of the above properties. The patch (dmaengine: vdma: Rename xilinx_vdma_ prefix to xilinx_dma) already got applied in the dma-next tree. That's why sent this patch to sync with the current driver I mean latest driver. Regards, Kedar. > > Sören
On 04/06/2016 06:25 PM, Appana Durga Kedareswara Rao wrote: > Hi Soren, > > >> -----Original Message----- >> From: Sören Brinkmann [mailto:soren.brinkmann@xilinx.com] >> Sent: Wednesday, April 06, 2016 9:50 PM >> To: Appana Durga Kedareswara Rao <appanad@xilinx.com> >> Cc: robh+dt@kernel.org; pawel.moll@arm.com; mark.rutland@arm.com; >> ijc+devicetree@hellion.org.uk; galak@codeaurora.org; Michal Simek >> <michals@xilinx.com>; vinod.koul@intel.com; dan.j.williams@intel.com; >> Appana Durga Kedareswara Rao <appanad@xilinx.com>; >> moritz.fischer@ettus.com; laurent.pinchart@ideasonboard.com; >> luis@debethencourt.com; Srikanth Vemula <svemula@xilinx.com>; Anirudha >> Sarangi <anirudh@xilinx.com>; devicetree@vger.kernel.org; linux-arm- >> kernel@lists.infradead.org; linux-kernel@vger.kernel.org; >> dmaengine@vger.kernel.org >> Subject: Re: [PATCH v3 1/5] Documentation: DT: vdma: Rename vdma-chan >> prefix to dma-chan >> >> On Wed, 2016-04-06 at 21:45:31 +0530, Kedareswara rao Appana wrote: >>> This patch renames the vdma-mm2s-channel/vdma-s2mm-channel >>> property with dma-mm2s-channel/dma-s2mm-channel to sync with the >>> driver. >>> >>> Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com> >>> --- >>> Changes for v3: >>> ---> New patch. >>> >>> Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt | 8 >>> ++++---- >>> 1 file changed, 4 insertions(+), 4 deletions(-) >>> >>> diff --git >>> a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt >>> b/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt >>> index a86737c..762938f 100644 >>> --- a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt >>> +++ b/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt >>> @@ -24,8 +24,8 @@ Optional properties: >>> {3}, flush s2mm channel >>> >>> Required child node properties: >>> -- compatible: It should be either "xlnx,axi-vdma-mm2s-channel" or >>> - "xlnx,axi-vdma-s2mm-channel". >>> +- compatible: It should be either "xlnx,axi-dma-mm2s-channel" or >>> + "xlnx,axi-dma-s2mm-channel". >> >> This change is not backwards compatible and breaks every user of the current >> binding. > > This commit http://git.kernel.org/cgit/linux/kernel/git/vkoul/slave-dma.git/commit/?h=next&id=8e66e7d682b04f7141f8ae666908c8dcd7fc0bfa > Renames xilinx_vdma_ prefix to xilinx_dma which includes renaming of the above properties. > The patch (dmaengine: vdma: Rename xilinx_vdma_ prefix to xilinx_dma) already got applied in the dma-next tree. > That's why sent this patch to sync with the current driver I mean latest driver. The correct solution for this is to revert that part of the change ASAP, since, as Soeren pointed out, it breaks all existing users. Thanks, - Lars -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
T24gV2VkLCAyMDE2LTA0LTA2IGF0IDIzOjE2ICswMjAwLCBMYXJzLVBldGVyIENsYXVzZW4gd3Jv dGU6DQo+IE9uIDA0LzA2LzIwMTYgMDY6MjUgUE0sIEFwcGFuYSBEdXJnYSBLZWRhcmVzd2FyYSBS YW8gd3JvdGU6DQo+ID4gYS9Eb2N1bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3MvZG1hL3hp bGlueC94aWxpbnhfdmRtYS50eHQNCj4gPiA+ID4gKysrDQo+ID4gPiA+IGIvRG9jdW1lbnRhdGlv bi9kZXZpY2V0cmVlL2JpbmRpbmdzL2RtYS94aWxpbngveGlsaW54X3ZkbWEudHh0DQo+ID4gPiA+ IEBAIC0yNCw4ICsyNCw4IEBAIE9wdGlvbmFsIHByb3BlcnRpZXM6DQo+ID4gPiA+ICAJezN9LCBm bHVzaCBzMm1tIGNoYW5uZWwNCj4gPiA+ID4gDQo+ID4gPiA+ICBSZXF1aXJlZCBjaGlsZCBub2Rl IHByb3BlcnRpZXM6DQo+ID4gPiA+IC0tIGNvbXBhdGlibGU6IEl0IHNob3VsZCBiZSBlaXRoZXIg InhsbngsYXhpLXZkbWEtbW0ycy1jaGFubmVsIg0KPiA+ID4gPiBvcg0KPiA+ID4gPiAtCSJ4bG54 LGF4aS12ZG1hLXMybW0tY2hhbm5lbCIuDQo+ID4gPiA+ICstIGNvbXBhdGlibGU6IEl0IHNob3Vs ZCBiZSBlaXRoZXIgInhsbngsYXhpLWRtYS1tbTJzLWNoYW5uZWwiDQo+ID4gPiA+IG9yDQo+ID4g PiA+ICsJInhsbngsYXhpLWRtYS1zMm1tLWNoYW5uZWwiLg0KPiA+ID4gDQo+ID4gPiBUaGlzIGNo YW5nZSBpcyBub3QgYmFja3dhcmRzIGNvbXBhdGlibGUgYW5kIGJyZWFrcyBldmVyeSB1c2VyIG9m DQo+ID4gPiB0aGUgY3VycmVudA0KPiA+ID4gYmluZGluZy4NCj4gPiANCj4gPiBUaGlzIGNvbW1p dCBodHRwOi8vZ2l0Lmtlcm5lbC5vcmcvY2dpdC9saW51eC9rZXJuZWwvZ2l0L3Zrb3VsL3NsYXZl LQ0KPiA+IGRtYS5naXQvY29tbWl0Lz9oPW5leHQmaWQ9OGU2NmU3ZDY4MmIwNGY3MTQxZjhhZTY2 NjkwOGM4ZGNkN2ZjMGJmYSANCj4gPiBSZW5hbWVzIHhpbGlueF92ZG1hXyBwcmVmaXggdG8geGls aW54X2RtYSB3aGljaCBpbmNsdWRlcyByZW5hbWluZyBvZg0KPiA+IHRoZSBhYm92ZSBwcm9wZXJ0 aWVzLg0KDQpUaGF0IHBhdGNoIGNoYW5nZXMgZHJpdmVyIGZyb20gdmRtYSB0byBkbWEuIEl0IGRv ZXMgbm90IGNoYW5nZSBwcm9wZXJ0eQ0KbmFtZSENCg0KPiA+IFRoZSBwYXRjaCAoZG1hZW5naW5l OiB2ZG1hOiBSZW5hbWUgeGlsaW54X3ZkbWFfIHByZWZpeCB0bw0KPiA+IHhpbGlueF9kbWEpIGFs cmVhZHkgZ290IGFwcGxpZWQgaW4gdGhlIGRtYS1uZXh0IHRyZWUuDQo+ID4gVGhhdCdzIHdoeSBz ZW50IHRoaXMgcGF0Y2ggdG8gc3luYyB3aXRoIHRoZSBjdXJyZW50IGRyaXZlciBJIG1lYW4NCj4g PiBsYXRlc3QgZHJpdmVyLg0KPiANCj4gVGhlIGNvcnJlY3Qgc29sdXRpb24gZm9yIHRoaXMgaXMg dG8gcmV2ZXJ0IHRoYXQgcGFydCBvZiB0aGUgY2hhbmdlDQo+IEFTQVAsDQo+IHNpbmNlLCBhcyBT b2VyZW4gcG9pbnRlZCBvdXQsIGl0IGJyZWFrcyBhbGwgZXhpc3RpbmcgdXNlcnMuDQoNCk5vIHRo ZSBjb21taXQgYXBwbGllZCBpcyBvbmx5IHRoZSBuYW1lIGNoYW5nZXMgaW5zaWRlIHRoZSBkcml2 ZXIuIFRoZXkNCmRvbid0IGJyZWFrIGFueXRoaW5nIHlldC4gSUlVQyB0aGlzIHBhdGNoIGJyZWFr cyBub3QgdGhlIGFwcGxpZWQgb25lLi4NCg0KVGhhbmtzDQotLSANCn5WaW5vZA0K -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2016-04-06 at 22:13:59 +0000, Koul, Vinod wrote: > On Wed, 2016-04-06 at 23:16 +0200, Lars-Peter Clausen wrote: > > On 04/06/2016 06:25 PM, Appana Durga Kedareswara Rao wrote: > > > a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt > > > > > +++ > > > > > b/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt > > > > > @@ -24,8 +24,8 @@ Optional properties: > > > > > {3}, flush s2mm channel > > > > > > > > > > Required child node properties: > > > > > -- compatible: It should be either "xlnx,axi-vdma-mm2s-channel" > > > > > or > > > > > - "xlnx,axi-vdma-s2mm-channel". > > > > > +- compatible: It should be either "xlnx,axi-dma-mm2s-channel" > > > > > or > > > > > + "xlnx,axi-dma-s2mm-channel". > > > > > > > > This change is not backwards compatible and breaks every user of > > > > the current > > > > binding. > > > > > > This commit http://git.kernel.org/cgit/linux/kernel/git/vkoul/slave- > > > dma.git/commit/?h=next&id=8e66e7d682b04f7141f8ae666908c8dcd7fc0bfa > > > Renames xilinx_vdma_ prefix to xilinx_dma which includes renaming of > > > the above properties. > > That patch changes driver from vdma to dma. It does not change property > name! It does. Unfortunately there are no line numbers on that website, hence here an excerpt from the commit you mention: @@ -1220,26 +1220,26 @@ static int xilinx_vdma_chan_probe(struct xilinx_vdma_device *xdev, if (!has_dre) xdev->common.copy_align = fls(width - 1); - if (of_device_is_compatible(node, "xlnx,axi-vdma-mm2s-channel")) { + if (of_device_is_compatible(node, "xlnx,axi-dma-mm2s-channel")) { chan->direction = DMA_MEM_TO_DEV; chan->id = 0; Sören -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
T24gV2VkLCAyMDE2LTA0LTA2IGF0IDE2OjAwIC0wNzAwLCBTw7ZyZW4gQnJpbmttYW5uIHdyb3Rl Og0KPiBPbiBXZWQsIDIwMTYtMDQtMDYgYXQgMjI6MTM6NTkgKzAwMDAsIEtvdWwsIFZpbm9kIHdy b3RlOg0KPiA+IE9uIFdlZCwgMjAxNi0wNC0wNiBhdCAyMzoxNiArMDIwMCwgTGFycy1QZXRlciBD bGF1c2VuIHdyb3RlOg0KPiA+ID4gT24gMDQvMDYvMjAxNiAwNjoyNSBQTSwgQXBwYW5hIER1cmdh IEtlZGFyZXN3YXJhIFJhbyB3cm90ZToNCj4gPiA+ID4gYS9Eb2N1bWVudGF0aW9uL2RldmljZXRy ZWUvYmluZGluZ3MvZG1hL3hpbGlueC94aWxpbnhfdmRtYS50eHQNCj4gPiA+ID4gPiA+ICsrKw0K PiA+ID4gPiA+ID4gYi9Eb2N1bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3MvZG1hL3hpbGlu eC94aWxpbnhfdmRtYS50DQo+ID4gPiA+ID4gPiB4dA0KPiA+ID4gPiA+ID4gQEAgLTI0LDggKzI0 LDggQEAgT3B0aW9uYWwgcHJvcGVydGllczoNCj4gPiA+ID4gPiA+ICAJezN9LCBmbHVzaCBzMm1t IGNoYW5uZWwNCj4gPiA+ID4gPiA+IA0KPiA+ID4gPiA+ID4gIFJlcXVpcmVkIGNoaWxkIG5vZGUg cHJvcGVydGllczoNCj4gPiA+ID4gPiA+IC0tIGNvbXBhdGlibGU6IEl0IHNob3VsZCBiZSBlaXRo ZXIgInhsbngsYXhpLXZkbWEtbW0ycw0KPiA+ID4gPiA+ID4gLWNoYW5uZWwiDQo+ID4gPiA+ID4g PiBvcg0KPiA+ID4gPiA+ID4gLQkieGxueCxheGktdmRtYS1zMm1tLWNoYW5uZWwiLg0KPiA+ID4g PiA+ID4gKy0gY29tcGF0aWJsZTogSXQgc2hvdWxkIGJlIGVpdGhlciAieGxueCxheGktZG1hLW1t MnMNCj4gPiA+ID4gPiA+IC1jaGFubmVsIg0KPiA+ID4gPiA+ID4gb3INCj4gPiA+ID4gPiA+ICsJ InhsbngsYXhpLWRtYS1zMm1tLWNoYW5uZWwiLg0KPiA+ID4gPiA+IA0KPiA+ID4gPiA+IFRoaXMg Y2hhbmdlIGlzIG5vdCBiYWNrd2FyZHMgY29tcGF0aWJsZSBhbmQgYnJlYWtzIGV2ZXJ5IHVzZXIN Cj4gPiA+ID4gPiBvZg0KPiA+ID4gPiA+IHRoZSBjdXJyZW50DQo+ID4gPiA+ID4gYmluZGluZy4N Cj4gPiA+ID4gDQo+ID4gPiA+IFRoaXMgY29tbWl0IA0KPiA+ID4gPiBodHRwOi8vZ2l0Lmtlcm5l bC5vcmcvY2dpdC9saW51eC9rZXJuZWwvZ2l0L3Zrb3VsL3NsYXZlLQ0KPiA+ID4gPiBkbWEuZ2l0 L2NvbW1pdC8/aD1uZXh0JmlkPThlNjZlN2Q2ODJiMDRmNzE0MWY4YWU2NjY5MDhjOGRjZDdmYzBi DQo+ID4gPiA+IGZhIA0KPiA+ID4gPiBSZW5hbWVzIHhpbGlueF92ZG1hXyBwcmVmaXggdG8geGls aW54X2RtYSB3aGljaCBpbmNsdWRlcw0KPiA+ID4gPiByZW5hbWluZyBvZg0KPiA+ID4gPiB0aGUg YWJvdmUgcHJvcGVydGllcy4NCj4gPiANCj4gPiBUaGF0IHBhdGNoIGNoYW5nZXMgZHJpdmVyIGZy b20gdmRtYSB0byBkbWEuIEl0IGRvZXMgbm90IGNoYW5nZQ0KPiA+IHByb3BlcnR5DQo+ID4gbmFt ZSENCj4gDQo+IEl0IGRvZXMuIFVuZm9ydHVuYXRlbHkgdGhlcmUgYXJlIG5vIGxpbmUgbnVtYmVy cyBvbiB0aGF0IHdlYnNpdGUsDQo+IGhlbmNlIGhlcmUgYW4gZXhjZXJwdA0KPiBmcm9tIHRoZSBj b21taXQgeW91IG1lbnRpb246DQo+IEBAIC0xMjIwLDI2ICsxMjIwLDI2IEBAIHN0YXRpYyBpbnQg eGlsaW54X3ZkbWFfY2hhbl9wcm9iZShzdHJ1Y3QNCj4geGlsaW54X3ZkbWFfZGV2aWNlICp4ZGV2 LA0KPiAgCWlmICghaGFzX2RyZSkNCj4gIAkJeGRldi0+Y29tbW9uLmNvcHlfYWxpZ24gPSBmbHMo d2lkdGggLSAxKTsNCj4gIA0KPiAtCWlmIChvZl9kZXZpY2VfaXNfY29tcGF0aWJsZShub2RlLCAi eGxueCxheGktdmRtYS1tbTJzDQo+IC1jaGFubmVsIikpIHsNCj4gKwlpZiAob2ZfZGV2aWNlX2lz X2NvbXBhdGlibGUobm9kZSwgInhsbngsYXhpLWRtYS1tbTJzDQo+IC1jaGFubmVsIikpIHsNCj4g IAkJY2hhbi0+ZGlyZWN0aW9uID0gRE1BX01FTV9UT19ERVY7DQo+ICAJCWNoYW4tPmlkID0gMDsN Cg0KUmlnaHQsIG1pc3NlZCB0aGF0IHNvbWVob3cuDQoNCkFtIGRyb3BwaW5nIHRoZSBwYXRjaA0K DQotLSANCn5WaW5vZA0K -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Vinod, > -----Original Message----- > From: Koul, Vinod [mailto:vinod.koul@intel.com] > Sent: Thursday, April 07, 2016 5:53 AM > To: Soren Brinkmann <sorenb@xilinx.com> > Cc: lars@metafoo.de; linux-kernel@vger.kernel.org; pawel.moll@arm.com; > Appana Durga Kedareswara Rao <appanad@xilinx.com>; > luis@debethencourt.com; moritz.fischer@ettus.com; robh+dt@kernel.org; > Srikanth Vemula <svemula@xilinx.com>; Michal Simek <michals@xilinx.com>; > Anirudha Sarangi <anirudh@xilinx.com>; devicetree@vger.kernel.org; Soren > Brinkmann <sorenb@xilinx.com>; Williams, Dan J <dan.j.williams@intel.com>; > mark.rutland@arm.com; galak@codeaurora.org; ijc+devicetree@hellion.org.uk; > dmaengine@vger.kernel.org; linux-arm-kernel@lists.infradead.org; > laurent.pinchart@ideasonboard.com > Subject: Re: [PATCH v3 1/5] Documentation: DT: vdma: Rename vdma-chan > prefix to dma-chan > > On Wed, 2016-04-06 at 16:00 -0700, Sören Brinkmann wrote: > > On Wed, 2016-04-06 at 22:13:59 +0000, Koul, Vinod wrote: > > > On Wed, 2016-04-06 at 23:16 +0200, Lars-Peter Clausen wrote: > > > > On 04/06/2016 06:25 PM, Appana Durga Kedareswara Rao wrote: > > > > > a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt > > > > > > > +++ > > > > > > > b/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.t > > > > > > > xt > > > > > > > @@ -24,8 +24,8 @@ Optional properties: > > > > > > > {3}, flush s2mm channel > > > > > > > > > > > > > > Required child node properties: > > > > > > > -- compatible: It should be either "xlnx,axi-vdma-mm2s > > > > > > > -channel" > > > > > > > or > > > > > > > - "xlnx,axi-vdma-s2mm-channel". > > > > > > > +- compatible: It should be either "xlnx,axi-dma-mm2s > > > > > > > -channel" > > > > > > > or > > > > > > > + "xlnx,axi-dma-s2mm-channel". > > > > > > > > > > > > This change is not backwards compatible and breaks every user > > > > > > of the current binding. > > > > > > > > > > This commit > > > > > http://git.kernel.org/cgit/linux/kernel/git/vkoul/slave- > > > > > > dma.git/commit/?h=next&id=8e66e7d682b04f7141f8ae666908c8dcd7fc0b > > > > > fa > > > > > Renames xilinx_vdma_ prefix to xilinx_dma which includes > > > > > renaming of the above properties. > > > > > > That patch changes driver from vdma to dma. It does not change > > > property name! > > > > It does. Unfortunately there are no line numbers on that website, > > hence here an excerpt from the commit you mention: > > @@ -1220,26 +1220,26 @@ static int xilinx_vdma_chan_probe(struct > > xilinx_vdma_device *xdev, > > if (!has_dre) > > xdev->common.copy_align = fls(width - 1); > > > > - if (of_device_is_compatible(node, "xlnx,axi-vdma-mm2s > > -channel")) { > > + if (of_device_is_compatible(node, "xlnx,axi-dma-mm2s > > -channel")) { > > chan->direction = DMA_MEM_TO_DEV; > > chan->id = 0; > > Right, missed that somehow. > > Am dropping the patch Will fix this part and will include this patch in v4 series... Regards, Kedar. > > -- > ~Vinod
diff --git a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt b/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt index a86737c..762938f 100644 --- a/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt +++ b/Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt @@ -24,8 +24,8 @@ Optional properties: {3}, flush s2mm channel Required child node properties: -- compatible: It should be either "xlnx,axi-vdma-mm2s-channel" or - "xlnx,axi-vdma-s2mm-channel". +- compatible: It should be either "xlnx,axi-dma-mm2s-channel" or + "xlnx,axi-dma-s2mm-channel". - interrupts: Should contain per channel VDMA interrupts. - xlnx,datawidth: Should contain the stream data width, take values {32,64...1024}. @@ -48,12 +48,12 @@ axi_vdma_0: axivdma@40030000 { xlnx,flush-fsync = <0x1>; xlnx,addrwidth = <0x20>; dma-channel@40030000 { - compatible = "xlnx,axi-vdma-mm2s-channel"; + compatible = "xlnx,axi-dma-mm2s-channel"; interrupts = < 0 54 4 >; xlnx,datawidth = <0x40>; } ; dma-channel@40030030 { - compatible = "xlnx,axi-vdma-s2mm-channel"; + compatible = "xlnx,axi-dma-s2mm-channel"; interrupts = < 0 53 4 >; xlnx,datawidth = <0x40>; } ;
This patch renames the vdma-mm2s-channel/vdma-s2mm-channel property with dma-mm2s-channel/dma-s2mm-channel to sync with the driver. Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com> --- Changes for v3: ---> New patch. Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)