From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mauro Carvalho Chehab Subject: Re: [PATCH 04/15] media: pxa_camera: remove the dmaengine compat need Date: Fri, 4 May 2018 16:29:32 -0300 Message-ID: <20180504162932.52a020cc@vento.lan> References: <20180402142656.26815-1-robert.jarzmik@free.fr> <20180402142656.26815-5-robert.jarzmik@free.fr> <89f3e97c-08a4-33b6-8fd3-0c1b4dea2065@xs4all.nl> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <89f3e97c-08a4-33b6-8fd3-0c1b4dea2065@xs4all.nl> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Hans Verkuil Cc: Ulf Hansson , alsa-devel@alsa-project.org, Takashi Iwai , linux-ide@vger.kernel.org, Pravin Shedge , netdev@vger.kernel.org, linux-mtd@lists.infradead.org, Laurent Pinchart , Robert Jarzmik , devel@driverdev.osuosl.org, Boris Brezillon , dmaengine@vger.kernel.org, Vinod Koul , Richard Weinberger , Robert Jarzmik , Marek Vasut , Ezequiel Garcia , linux-media@vger.kernel.org, Samuel Ortiz , Arnd Bergmann , Bartlomiej Zolnierkiewicz , Haojian Zhuang , Flavio Ceolin , Mark List-Id: alsa-devel@alsa-project.org Em Sun, 22 Apr 2018 13:06:12 +0200 Hans Verkuil escreveu: > On 04/02/2018 04:26 PM, Robert Jarzmik wrote: > > From: Robert Jarzmik > > > > As the pxa architecture switched towards the dmaengine slave map, the > > old compatibility mechanism to acquire the dma requestor line number and > > priority are not needed anymore. > > > > This patch simplifies the dma resource acquisition, using the more > > generic function dma_request_slave_channel(). > > > > Signed-off-by: Robert Jarzmik > > Acked-by: Hans Verkuil I'm assuming that you'll be applying it together with other PXA patches. So: Acked-by: Mauro Carvalho Chehab Regards, Mauro > > Regards, > > Hans > > > --- > > drivers/media/platform/pxa_camera.c | 22 +++------------------- > > 1 file changed, 3 insertions(+), 19 deletions(-) > > > > diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c > > index c71a00736541..4c82d1880753 100644 > > --- a/drivers/media/platform/pxa_camera.c > > +++ b/drivers/media/platform/pxa_camera.c > > @@ -2357,8 +2357,6 @@ static int pxa_camera_probe(struct platform_device *pdev) > > .src_maxburst = 8, > > .direction = DMA_DEV_TO_MEM, > > }; > > - dma_cap_mask_t mask; > > - struct pxad_param params; > > char clk_name[V4L2_CLK_NAME_SIZE]; > > int irq; > > int err = 0, i; > > @@ -2432,34 +2430,20 @@ static int pxa_camera_probe(struct platform_device *pdev) > > pcdev->base = base; > > > > /* request dma */ > > - dma_cap_zero(mask); > > - dma_cap_set(DMA_SLAVE, mask); > > - dma_cap_set(DMA_PRIVATE, mask); > > - > > - params.prio = 0; > > - params.drcmr = 68; > > - pcdev->dma_chans[0] = > > - dma_request_slave_channel_compat(mask, pxad_filter_fn, > > - ¶ms, &pdev->dev, "CI_Y"); > > + pcdev->dma_chans[0] = dma_request_slave_channel(&pdev->dev, "CI_Y"); > > if (!pcdev->dma_chans[0]) { > > dev_err(&pdev->dev, "Can't request DMA for Y\n"); > > return -ENODEV; > > } > > > > - params.drcmr = 69; > > - pcdev->dma_chans[1] = > > - dma_request_slave_channel_compat(mask, pxad_filter_fn, > > - ¶ms, &pdev->dev, "CI_U"); > > + pcdev->dma_chans[1] = dma_request_slave_channel(&pdev->dev, "CI_U"); > > if (!pcdev->dma_chans[1]) { > > dev_err(&pdev->dev, "Can't request DMA for Y\n"); > > err = -ENODEV; > > goto exit_free_dma_y; > > } > > > > - params.drcmr = 70; > > - pcdev->dma_chans[2] = > > - dma_request_slave_channel_compat(mask, pxad_filter_fn, > > - ¶ms, &pdev->dev, "CI_V"); > > + pcdev->dma_chans[2] = dma_request_slave_channel(&pdev->dev, "CI_V"); > > if (!pcdev->dma_chans[2]) { > > dev_err(&pdev->dev, "Can't request DMA for V\n"); > > err = -ENODEV; > > > Thanks, Mauro 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: [04/15] media: pxa_camera: remove the dmaengine compat need From: Mauro Carvalho Chehab Message-Id: <20180504162932.52a020cc@vento.lan> Date: Fri, 4 May 2018 16:29:32 -0300 To: Hans Verkuil Cc: Robert Jarzmik , Daniel Mack , Haojian Zhuang , Bartlomiej Zolnierkiewicz , Tejun Heo , Vinod Koul , Mauro Carvalho Chehab , Ulf Hansson , Ezequiel Garcia , Boris Brezillon , David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Cyrille Pitchen , Nicolas Pitre , Samuel Ortiz , Greg Kroah-Hartman , Jaroslav Kysela , Takashi Iwai , Liam Girdwood , Mark Brown , Arnd Bergmann , Petr Cvek , Sakari Ailus , Laurent Pinchart , Pravin Shedge , Flavio Ceolin , Robert Jarzmik , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, dmaengine@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org, netdev@vger.kernel.org, devel@driverdev.osuosl.org, alsa-devel@alsa-project.org, Niklas =?UTF-8?B?U8O2ZGVybHVuZA==?= List-ID: RW0gU3VuLCAyMiBBcHIgMjAxOCAxMzowNjoxMiArMDIwMApIYW5zIFZlcmt1aWwgPGh2ZXJrdWls QHhzNGFsbC5ubD4gZXNjcmV2ZXU6Cgo+IE9uIDA0LzAyLzIwMTggMDQ6MjYgUE0sIFJvYmVydCBK YXJ6bWlrIHdyb3RlOgo+ID4gRnJvbTogUm9iZXJ0IEphcnptaWsgPHJvYmVydC5qYXJ6bWlrQHJl bmF1bHQuY29tPgo+ID4gCj4gPiBBcyB0aGUgcHhhIGFyY2hpdGVjdHVyZSBzd2l0Y2hlZCB0b3dh cmRzIHRoZSBkbWFlbmdpbmUgc2xhdmUgbWFwLCB0aGUKPiA+IG9sZCBjb21wYXRpYmlsaXR5IG1l Y2hhbmlzbSB0byBhY3F1aXJlIHRoZSBkbWEgcmVxdWVzdG9yIGxpbmUgbnVtYmVyIGFuZAo+ID4g cHJpb3JpdHkgYXJlIG5vdCBuZWVkZWQgYW55bW9yZS4KPiA+IAo+ID4gVGhpcyBwYXRjaCBzaW1w bGlmaWVzIHRoZSBkbWEgcmVzb3VyY2UgYWNxdWlzaXRpb24sIHVzaW5nIHRoZSBtb3JlCj4gPiBn ZW5lcmljIGZ1bmN0aW9uIGRtYV9yZXF1ZXN0X3NsYXZlX2NoYW5uZWwoKS4KPiA+IAo+ID4gU2ln bmVkLW9mZi1ieTogUm9iZXJ0IEphcnptaWsgPHJvYmVydC5qYXJ6bWlrQGZyZWUuZnI+ICAKPiAK PiBBY2tlZC1ieTogSGFucyBWZXJrdWlsIDxoYW5zLnZlcmt1aWxAY2lzY28uY29tPgoKSSdtIGFz c3VtaW5nIHRoYXQgeW91J2xsIGJlIGFwcGx5aW5nIGl0IHRvZ2V0aGVyIHdpdGggb3RoZXIgUFhB IHBhdGNoZXMuClNvOgoKQWNrZWQtYnk6IE1hdXJvIENhcnZhbGhvIENoZWhhYiA8bWNoZWhhYitz YW1zdW5nQGtlcm5lbC5vcmc+CgpSZWdhcmRzLApNYXVybwo+IAo+IFJlZ2FyZHMsCj4gCj4gCUhh bnMKPiAKPiA+IC0tLQo+ID4gIGRyaXZlcnMvbWVkaWEvcGxhdGZvcm0vcHhhX2NhbWVyYS5jIHwg MjIgKysrLS0tLS0tLS0tLS0tLS0tLS0tLQo+ID4gIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlv bnMoKyksIDE5IGRlbGV0aW9ucygtKQo+ID4gCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tZWRp YS9wbGF0Zm9ybS9weGFfY2FtZXJhLmMgYi9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL3B4YV9jYW1l cmEuYwo+ID4gaW5kZXggYzcxYTAwNzM2NTQxLi40YzgyZDE4ODA3NTMgMTAwNjQ0Cj4gPiAtLS0g YS9kcml2ZXJzL21lZGlhL3BsYXRmb3JtL3B4YV9jYW1lcmEuYwo+ID4gKysrIGIvZHJpdmVycy9t ZWRpYS9wbGF0Zm9ybS9weGFfY2FtZXJhLmMKPiA+IEBAIC0yMzU3LDggKzIzNTcsNiBAQCBzdGF0 aWMgaW50IHB4YV9jYW1lcmFfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKPiA+ ICAJCS5zcmNfbWF4YnVyc3QgPSA4LAo+ID4gIAkJLmRpcmVjdGlvbiA9IERNQV9ERVZfVE9fTUVN LAo+ID4gIAl9Owo+ID4gLQlkbWFfY2FwX21hc2tfdCBtYXNrOwo+ID4gLQlzdHJ1Y3QgcHhhZF9w YXJhbSBwYXJhbXM7Cj4gPiAgCWNoYXIgY2xrX25hbWVbVjRMMl9DTEtfTkFNRV9TSVpFXTsKPiA+ ICAJaW50IGlycTsKPiA+ICAJaW50IGVyciA9IDAsIGk7Cj4gPiBAQCAtMjQzMiwzNCArMjQzMCwy MCBAQCBzdGF0aWMgaW50IHB4YV9jYW1lcmFfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAq cGRldikKPiA+ICAJcGNkZXYtPmJhc2UgPSBiYXNlOwo+ID4gIAo+ID4gIAkvKiByZXF1ZXN0IGRt YSAqLwo+ID4gLQlkbWFfY2FwX3plcm8obWFzayk7Cj4gPiAtCWRtYV9jYXBfc2V0KERNQV9TTEFW RSwgbWFzayk7Cj4gPiAtCWRtYV9jYXBfc2V0KERNQV9QUklWQVRFLCBtYXNrKTsKPiA+IC0KPiA+ IC0JcGFyYW1zLnByaW8gPSAwOwo+ID4gLQlwYXJhbXMuZHJjbXIgPSA2ODsKPiA+IC0JcGNkZXYt PmRtYV9jaGFuc1swXSA9Cj4gPiAtCQlkbWFfcmVxdWVzdF9zbGF2ZV9jaGFubmVsX2NvbXBhdCht YXNrLCBweGFkX2ZpbHRlcl9mbiwKPiA+IC0JCQkJCQkgJnBhcmFtcywgJnBkZXYtPmRldiwgIkNJ X1kiKTsKPiA+ICsJcGNkZXYtPmRtYV9jaGFuc1swXSA9IGRtYV9yZXF1ZXN0X3NsYXZlX2NoYW5u ZWwoJnBkZXYtPmRldiwgIkNJX1kiKTsKPiA+ICAJaWYgKCFwY2Rldi0+ZG1hX2NoYW5zWzBdKSB7 Cj4gPiAgCQlkZXZfZXJyKCZwZGV2LT5kZXYsICJDYW4ndCByZXF1ZXN0IERNQSBmb3IgWVxuIik7 Cj4gPiAgCQlyZXR1cm4gLUVOT0RFVjsKPiA+ICAJfQo+ID4gIAo+ID4gLQlwYXJhbXMuZHJjbXIg PSA2OTsKPiA+IC0JcGNkZXYtPmRtYV9jaGFuc1sxXSA9Cj4gPiAtCQlkbWFfcmVxdWVzdF9zbGF2 ZV9jaGFubmVsX2NvbXBhdChtYXNrLCBweGFkX2ZpbHRlcl9mbiwKPiA+IC0JCQkJCQkgJnBhcmFt cywgJnBkZXYtPmRldiwgIkNJX1UiKTsKPiA+ICsJcGNkZXYtPmRtYV9jaGFuc1sxXSA9IGRtYV9y ZXF1ZXN0X3NsYXZlX2NoYW5uZWwoJnBkZXYtPmRldiwgIkNJX1UiKTsKPiA+ICAJaWYgKCFwY2Rl di0+ZG1hX2NoYW5zWzFdKSB7Cj4gPiAgCQlkZXZfZXJyKCZwZGV2LT5kZXYsICJDYW4ndCByZXF1 ZXN0IERNQSBmb3IgWVxuIik7Cj4gPiAgCQllcnIgPSAtRU5PREVWOwo+ID4gIAkJZ290byBleGl0 X2ZyZWVfZG1hX3k7Cj4gPiAgCX0KPiA+ICAKPiA+IC0JcGFyYW1zLmRyY21yID0gNzA7Cj4gPiAt CXBjZGV2LT5kbWFfY2hhbnNbMl0gPQo+ID4gLQkJZG1hX3JlcXVlc3Rfc2xhdmVfY2hhbm5lbF9j b21wYXQobWFzaywgcHhhZF9maWx0ZXJfZm4sCj4gPiAtCQkJCQkJICZwYXJhbXMsICZwZGV2LT5k ZXYsICJDSV9WIik7Cj4gPiArCXBjZGV2LT5kbWFfY2hhbnNbMl0gPSBkbWFfcmVxdWVzdF9zbGF2 ZV9jaGFubmVsKCZwZGV2LT5kZXYsICJDSV9WIik7Cj4gPiAgCWlmICghcGNkZXYtPmRtYV9jaGFu c1syXSkgewo+ID4gIAkJZGV2X2VycigmcGRldi0+ZGV2LCAiQ2FuJ3QgcmVxdWVzdCBETUEgZm9y IFZcbiIpOwo+ID4gIAkJZXJyID0gLUVOT0RFVjsKPiA+ICAgCj4gCgoKClRoYW5rcywKTWF1cm8K LS0tClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNj cmliZSBkbWFlbmdpbmUiIGluCnRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRvbW9Admdl ci5rZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5v cmcvbWFqb3Jkb21vLWluZm8uaHRtbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Date: Fri, 4 May 2018 16:29:32 -0300 From: Mauro Carvalho Chehab To: Hans Verkuil Cc: Robert Jarzmik , Daniel Mack , Haojian Zhuang , Bartlomiej Zolnierkiewicz , Tejun Heo , Vinod Koul , Mauro Carvalho Chehab , Ulf Hansson , Ezequiel Garcia , Boris Brezillon , David Woodhouse , Brian Norris , Marek Vasut , Richard Weinberger , Cyrille Pitchen , Nicolas Pitre , Samuel Ortiz , Greg Kroah-Hartman , Jaroslav Kysela , Takashi Iwai , Liam Girdwood , Mark Brown , Arnd Bergmann , Petr Cvek , Sakari Ailus , Laurent Pinchart , Pravin Shedge , Flavio Ceolin , Robert Jarzmik , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, dmaengine@vger.kernel.org, linux-media@vger.kernel.org, linux-mmc@vger.kernel.org, linux-mtd@lists.infradead.org, netdev@vger.kernel.org, devel@driverdev.osuosl.org, alsa-devel@alsa-project.org, Niklas =?UTF-8?B?U8O2ZGVybHVuZA==?= Subject: Re: [PATCH 04/15] media: pxa_camera: remove the dmaengine compat need Message-ID: <20180504162932.52a020cc@vento.lan> In-Reply-To: <89f3e97c-08a4-33b6-8fd3-0c1b4dea2065@xs4all.nl> References: <20180402142656.26815-1-robert.jarzmik@free.fr> <20180402142656.26815-5-robert.jarzmik@free.fr> <89f3e97c-08a4-33b6-8fd3-0c1b4dea2065@xs4all.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Em Sun, 22 Apr 2018 13:06:12 +0200 Hans Verkuil escreveu: > On 04/02/2018 04:26 PM, Robert Jarzmik wrote: > > From: Robert Jarzmik > > > > As the pxa architecture switched towards the dmaengine slave map, the > > old compatibility mechanism to acquire the dma requestor line number and > > priority are not needed anymore. > > > > This patch simplifies the dma resource acquisition, using the more > > generic function dma_request_slave_channel(). > > > > Signed-off-by: Robert Jarzmik > > Acked-by: Hans Verkuil I'm assuming that you'll be applying it together with other PXA patches. So: Acked-by: Mauro Carvalho Chehab Regards, Mauro > > Regards, > > Hans > > > --- > > drivers/media/platform/pxa_camera.c | 22 +++------------------- > > 1 file changed, 3 insertions(+), 19 deletions(-) > > > > diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c > > index c71a00736541..4c82d1880753 100644 > > --- a/drivers/media/platform/pxa_camera.c > > +++ b/drivers/media/platform/pxa_camera.c > > @@ -2357,8 +2357,6 @@ static int pxa_camera_probe(struct platform_device *pdev) > > .src_maxburst = 8, > > .direction = DMA_DEV_TO_MEM, > > }; > > - dma_cap_mask_t mask; > > - struct pxad_param params; > > char clk_name[V4L2_CLK_NAME_SIZE]; > > int irq; > > int err = 0, i; > > @@ -2432,34 +2430,20 @@ static int pxa_camera_probe(struct platform_device *pdev) > > pcdev->base = base; > > > > /* request dma */ > > - dma_cap_zero(mask); > > - dma_cap_set(DMA_SLAVE, mask); > > - dma_cap_set(DMA_PRIVATE, mask); > > - > > - params.prio = 0; > > - params.drcmr = 68; > > - pcdev->dma_chans[0] = > > - dma_request_slave_channel_compat(mask, pxad_filter_fn, > > - ¶ms, &pdev->dev, "CI_Y"); > > + pcdev->dma_chans[0] = dma_request_slave_channel(&pdev->dev, "CI_Y"); > > if (!pcdev->dma_chans[0]) { > > dev_err(&pdev->dev, "Can't request DMA for Y\n"); > > return -ENODEV; > > } > > > > - params.drcmr = 69; > > - pcdev->dma_chans[1] = > > - dma_request_slave_channel_compat(mask, pxad_filter_fn, > > - ¶ms, &pdev->dev, "CI_U"); > > + pcdev->dma_chans[1] = dma_request_slave_channel(&pdev->dev, "CI_U"); > > if (!pcdev->dma_chans[1]) { > > dev_err(&pdev->dev, "Can't request DMA for Y\n"); > > err = -ENODEV; > > goto exit_free_dma_y; > > } > > > > - params.drcmr = 70; > > - pcdev->dma_chans[2] = > > - dma_request_slave_channel_compat(mask, pxad_filter_fn, > > - ¶ms, &pdev->dev, "CI_V"); > > + pcdev->dma_chans[2] = dma_request_slave_channel(&pdev->dev, "CI_V"); > > if (!pcdev->dma_chans[2]) { > > dev_err(&pdev->dev, "Can't request DMA for V\n"); > > err = -ENODEV; > > > Thanks, Mauro From mboxrd@z Thu Jan 1 00:00:00 1970 From: mchehab+samsung@kernel.org (Mauro Carvalho Chehab) Date: Fri, 4 May 2018 16:29:32 -0300 Subject: [PATCH 04/15] media: pxa_camera: remove the dmaengine compat need In-Reply-To: <89f3e97c-08a4-33b6-8fd3-0c1b4dea2065@xs4all.nl> References: <20180402142656.26815-1-robert.jarzmik@free.fr> <20180402142656.26815-5-robert.jarzmik@free.fr> <89f3e97c-08a4-33b6-8fd3-0c1b4dea2065@xs4all.nl> Message-ID: <20180504162932.52a020cc@vento.lan> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Em Sun, 22 Apr 2018 13:06:12 +0200 Hans Verkuil escreveu: > On 04/02/2018 04:26 PM, Robert Jarzmik wrote: > > From: Robert Jarzmik > > > > As the pxa architecture switched towards the dmaengine slave map, the > > old compatibility mechanism to acquire the dma requestor line number and > > priority are not needed anymore. > > > > This patch simplifies the dma resource acquisition, using the more > > generic function dma_request_slave_channel(). > > > > Signed-off-by: Robert Jarzmik > > Acked-by: Hans Verkuil I'm assuming that you'll be applying it together with other PXA patches. So: Acked-by: Mauro Carvalho Chehab Regards, Mauro > > Regards, > > Hans > > > --- > > drivers/media/platform/pxa_camera.c | 22 +++------------------- > > 1 file changed, 3 insertions(+), 19 deletions(-) > > > > diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c > > index c71a00736541..4c82d1880753 100644 > > --- a/drivers/media/platform/pxa_camera.c > > +++ b/drivers/media/platform/pxa_camera.c > > @@ -2357,8 +2357,6 @@ static int pxa_camera_probe(struct platform_device *pdev) > > .src_maxburst = 8, > > .direction = DMA_DEV_TO_MEM, > > }; > > - dma_cap_mask_t mask; > > - struct pxad_param params; > > char clk_name[V4L2_CLK_NAME_SIZE]; > > int irq; > > int err = 0, i; > > @@ -2432,34 +2430,20 @@ static int pxa_camera_probe(struct platform_device *pdev) > > pcdev->base = base; > > > > /* request dma */ > > - dma_cap_zero(mask); > > - dma_cap_set(DMA_SLAVE, mask); > > - dma_cap_set(DMA_PRIVATE, mask); > > - > > - params.prio = 0; > > - params.drcmr = 68; > > - pcdev->dma_chans[0] = > > - dma_request_slave_channel_compat(mask, pxad_filter_fn, > > - ¶ms, &pdev->dev, "CI_Y"); > > + pcdev->dma_chans[0] = dma_request_slave_channel(&pdev->dev, "CI_Y"); > > if (!pcdev->dma_chans[0]) { > > dev_err(&pdev->dev, "Can't request DMA for Y\n"); > > return -ENODEV; > > } > > > > - params.drcmr = 69; > > - pcdev->dma_chans[1] = > > - dma_request_slave_channel_compat(mask, pxad_filter_fn, > > - ¶ms, &pdev->dev, "CI_U"); > > + pcdev->dma_chans[1] = dma_request_slave_channel(&pdev->dev, "CI_U"); > > if (!pcdev->dma_chans[1]) { > > dev_err(&pdev->dev, "Can't request DMA for Y\n"); > > err = -ENODEV; > > goto exit_free_dma_y; > > } > > > > - params.drcmr = 70; > > - pcdev->dma_chans[2] = > > - dma_request_slave_channel_compat(mask, pxad_filter_fn, > > - ¶ms, &pdev->dev, "CI_V"); > > + pcdev->dma_chans[2] = dma_request_slave_channel(&pdev->dev, "CI_V"); > > if (!pcdev->dma_chans[2]) { > > dev_err(&pdev->dev, "Can't request DMA for V\n"); > > err = -ENODEV; > > > Thanks, Mauro From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mauro Carvalho Chehab Subject: Re: [PATCH 04/15] media: pxa_camera: remove the dmaengine compat need Date: Fri, 4 May 2018 16:29:32 -0300 Message-ID: <20180504162932.52a020cc@vento.lan> References: <20180402142656.26815-1-robert.jarzmik@free.fr> <20180402142656.26815-5-robert.jarzmik@free.fr> <89f3e97c-08a4-33b6-8fd3-0c1b4dea2065@xs4all.nl> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Ulf Hansson , alsa-devel@alsa-project.org, Takashi Iwai , linux-ide@vger.kernel.org, Pravin Shedge , netdev@vger.kernel.org, linux-mtd@lists.infradead.org, Laurent Pinchart , Robert Jarzmik , devel@driverdev.osuosl.org, Boris Brezillon , dmaengine@vger.kernel.org, Vinod Koul , Richard Weinberger , Robert Jarzmik , Marek Vasut , Ezequiel Garcia , linux-media@vger.kernel.org, Samuel Ortiz , Arnd Bergmann , Bartlomiej Zolnierkiewicz , Haojian Zhuang , Flavio Ceolin , Mark Brow To: Hans Verkuil Return-path: In-Reply-To: <89f3e97c-08a4-33b6-8fd3-0c1b4dea2065@xs4all.nl> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org List-Id: netdev.vger.kernel.org Em Sun, 22 Apr 2018 13:06:12 +0200 Hans Verkuil escreveu: > On 04/02/2018 04:26 PM, Robert Jarzmik wrote: > > From: Robert Jarzmik > > > > As the pxa architecture switched towards the dmaengine slave map, the > > old compatibility mechanism to acquire the dma requestor line number and > > priority are not needed anymore. > > > > This patch simplifies the dma resource acquisition, using the more > > generic function dma_request_slave_channel(). > > > > Signed-off-by: Robert Jarzmik > > Acked-by: Hans Verkuil I'm assuming that you'll be applying it together with other PXA patches. So: Acked-by: Mauro Carvalho Chehab Regards, Mauro > > Regards, > > Hans > > > --- > > drivers/media/platform/pxa_camera.c | 22 +++------------------- > > 1 file changed, 3 insertions(+), 19 deletions(-) > > > > diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c > > index c71a00736541..4c82d1880753 100644 > > --- a/drivers/media/platform/pxa_camera.c > > +++ b/drivers/media/platform/pxa_camera.c > > @@ -2357,8 +2357,6 @@ static int pxa_camera_probe(struct platform_device *pdev) > > .src_maxburst = 8, > > .direction = DMA_DEV_TO_MEM, > > }; > > - dma_cap_mask_t mask; > > - struct pxad_param params; > > char clk_name[V4L2_CLK_NAME_SIZE]; > > int irq; > > int err = 0, i; > > @@ -2432,34 +2430,20 @@ static int pxa_camera_probe(struct platform_device *pdev) > > pcdev->base = base; > > > > /* request dma */ > > - dma_cap_zero(mask); > > - dma_cap_set(DMA_SLAVE, mask); > > - dma_cap_set(DMA_PRIVATE, mask); > > - > > - params.prio = 0; > > - params.drcmr = 68; > > - pcdev->dma_chans[0] = > > - dma_request_slave_channel_compat(mask, pxad_filter_fn, > > - ¶ms, &pdev->dev, "CI_Y"); > > + pcdev->dma_chans[0] = dma_request_slave_channel(&pdev->dev, "CI_Y"); > > if (!pcdev->dma_chans[0]) { > > dev_err(&pdev->dev, "Can't request DMA for Y\n"); > > return -ENODEV; > > } > > > > - params.drcmr = 69; > > - pcdev->dma_chans[1] = > > - dma_request_slave_channel_compat(mask, pxad_filter_fn, > > - ¶ms, &pdev->dev, "CI_U"); > > + pcdev->dma_chans[1] = dma_request_slave_channel(&pdev->dev, "CI_U"); > > if (!pcdev->dma_chans[1]) { > > dev_err(&pdev->dev, "Can't request DMA for Y\n"); > > err = -ENODEV; > > goto exit_free_dma_y; > > } > > > > - params.drcmr = 70; > > - pcdev->dma_chans[2] = > > - dma_request_slave_channel_compat(mask, pxad_filter_fn, > > - ¶ms, &pdev->dev, "CI_V"); > > + pcdev->dma_chans[2] = dma_request_slave_channel(&pdev->dev, "CI_V"); > > if (!pcdev->dma_chans[2]) { > > dev_err(&pdev->dev, "Can't request DMA for V\n"); > > err = -ENODEV; > > > Thanks, Mauro