| Message ID | 1459959335-24083-2-git-send-email-appanad@xilinx.com (mailing list archive) |
|---|---|
| State | New, archived |
| 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
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
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! > > 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. No the commit applied is only the name changes inside the driver. They don't break anything yet. IIUC this patch breaks not the applied one.. Thanks
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
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 -- ~Vinod
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(-)