From: Hans Verkuil <hverkuil@xs4all.nl> To: Robert Jarzmik <robert.jarzmik@free.fr> Cc: Arnd Bergmann <arnd@arndb.de>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: Re: [PATCH 04/15] media: pxa_camera: remove the dmaengine compat need Date: Sun, 22 Apr 2018 13:06:34 +0200 [thread overview] Message-ID: <dcd81a87-ca7a-3bc8-c457-320d4ce60a83@xs4all.nl> (raw) In-Reply-To: <871sf8z7f4.fsf@belgarion.home> On 04/21/2018 09:27 PM, Robert Jarzmik wrote: > Robert Jarzmik <robert.jarzmik@free.fr> writes: > >> From: Robert Jarzmik <robert.jarzmik@renault.com> >> >> 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 <robert.jarzmik@free.fr> >> --- >> drivers/media/platform/pxa_camera.c | 22 +++------------------- >> 1 file changed, 3 insertions(+), 19 deletions(-) > Hans, could I have your ack please ? Done. Hans > > Cheers. > > -- > Robert > > PS: The submitted patch >> >> 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;
WARNING: multiple messages have this Message-ID (diff)
From: hverkuil@xs4all.nl (Hans Verkuil) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/15] media: pxa_camera: remove the dmaengine compat need Date: Sun, 22 Apr 2018 13:06:34 +0200 [thread overview] Message-ID: <dcd81a87-ca7a-3bc8-c457-320d4ce60a83@xs4all.nl> (raw) In-Reply-To: <871sf8z7f4.fsf@belgarion.home> On 04/21/2018 09:27 PM, Robert Jarzmik wrote: > Robert Jarzmik <robert.jarzmik@free.fr> writes: > >> From: Robert Jarzmik <robert.jarzmik@renault.com> >> >> 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 <robert.jarzmik@free.fr> >> --- >> drivers/media/platform/pxa_camera.c | 22 +++------------------- >> 1 file changed, 3 insertions(+), 19 deletions(-) > Hans, could I have your ack please ? Done. Hans > > Cheers. > > -- > Robert > > PS: The submitted patch >> >> 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;
next prev parent reply other threads:[~2018-04-22 11:06 UTC|newest] Thread overview: 218+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-02 14:26 [PATCH 00/15] ARM: pxa: switch to DMA slave maps Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` [01/15] dmaengine: pxa: use a dma slave map Robert Jarzmik 2018-04-02 14:26 ` [PATCH 01/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-21 19:23 ` Robert Jarzmik 2018-04-02 14:26 ` [04/15] media: pxa_camera: remove the dmaengine compat need Robert Jarzmik 2018-04-02 14:26 ` [PATCH 04/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-21 19:27 ` Robert Jarzmik 2018-04-21 19:27 ` Robert Jarzmik 2018-04-22 11:06 ` Hans Verkuil [this message] 2018-04-22 11:06 ` Hans Verkuil 2018-04-02 14:26 ` [05/15] mtd: nand: pxa3xx: " Robert Jarzmik 2018-04-02 14:26 ` [PATCH 05/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-03 7:33 ` Miquel Raynal 2018-04-03 15:19 ` Robert Jarzmik 2018-04-02 14:26 ` [09/15] net: irda: pxaficp_ir: " Robert Jarzmik 2018-04-02 14:26 ` [PATCH 09/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-21 19:30 ` Robert Jarzmik 2018-04-21 19:30 ` Robert Jarzmik 2018-04-02 14:26 ` [10/15] ata: pata_pxa: " Robert Jarzmik 2018-04-02 14:26 ` [PATCH 10/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-21 19:32 ` Robert Jarzmik 2018-04-21 19:32 ` Robert Jarzmik 2018-04-24 11:04 ` Bartlomiej Zolnierkiewicz 2018-04-24 11:04 ` Bartlomiej Zolnierkiewicz 2018-04-02 14:26 ` [14/15] ARM: pxa: change SSP devices allocation Robert Jarzmik 2018-04-02 14:26 ` [PATCH 14/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-03 7:06 ` [14/15] " Arnd Bergmann 2018-04-03 7:06 ` [PATCH 14/15] " Arnd Bergmann 2018-04-03 7:06 ` Arnd Bergmann 2018-04-03 7:06 ` Arnd Bergmann 2018-04-03 7:06 ` Arnd Bergmann 2018-04-03 7:06 ` Arnd Bergmann 2018-04-03 15:32 ` Robert Jarzmik 2018-04-03 15:32 ` Robert Jarzmik 2018-04-03 15:53 ` Arnd Bergmann 2018-04-03 15:53 ` Arnd Bergmann 2018-04-05 6:51 ` Robert Jarzmik 2018-04-05 6:51 ` Robert Jarzmik 2018-04-05 7:29 ` Arnd Bergmann 2018-04-05 7:29 ` Arnd Bergmann 2018-04-08 12:16 ` Robert Jarzmik 2018-04-08 12:16 ` Robert Jarzmik 2018-04-08 12:16 ` Robert Jarzmik 2018-04-03 7:15 ` [PATCH 00/15] ARM: pxa: switch to DMA slave maps Arnd Bergmann 2018-04-03 7:15 ` Arnd Bergmann 2018-04-03 7:15 ` Arnd Bergmann 2018-04-03 7:15 ` Arnd Bergmann 2018-04-03 7:15 ` Arnd Bergmann 2018-04-03 15:08 ` Ulf Hansson 2018-04-03 15:08 ` Ulf Hansson 2018-04-03 15:08 ` Ulf Hansson 2018-04-03 15:08 ` Ulf Hansson 2018-04-04 19:49 ` Robert Jarzmik 2018-04-04 19:49 ` Robert Jarzmik 2018-04-04 19:49 ` Robert Jarzmik 2018-04-04 19:49 ` Robert Jarzmik 2018-04-04 19:56 ` Boris Brezillon 2018-04-04 19:56 ` Boris Brezillon 2018-04-04 19:56 ` Boris Brezillon 2018-04-04 19:56 ` Boris Brezillon 2018-04-04 19:56 ` Boris Brezillon 2018-04-05 6:29 ` Ulf Hansson 2018-04-05 6:29 ` Ulf Hansson 2018-04-05 6:29 ` Ulf Hansson 2018-04-05 6:29 ` Ulf Hansson 2018-04-05 6:50 ` Arnd Bergmann 2018-04-05 6:50 ` Arnd Bergmann 2018-04-05 6:50 ` Arnd Bergmann 2018-04-05 6:50 ` Arnd Bergmann 2018-04-02 14:26 [02/15] ARM: pxa: add dma slave map Robert Jarzmik 2018-04-02 14:26 ` [PATCH 02/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 [03/15] mmc: pxamci: remove the dmaengine compat need Robert Jarzmik 2018-04-02 14:26 ` [PATCH 03/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 [06/15] net: smc911x: " Robert Jarzmik 2018-04-02 14:26 ` [PATCH 06/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 [07/15] net: smc91x: " Robert Jarzmik 2018-04-02 14:26 ` [PATCH 07/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 [08/15] ASoC: pxa: " Robert Jarzmik 2018-04-02 14:26 ` [PATCH 08/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 [11/15] dmaengine: pxa: document pxad_param Robert Jarzmik 2018-04-02 14:26 ` [PATCH 11/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 [12/15] dmaengine: pxa: make the filter function internal Robert Jarzmik 2018-04-02 14:26 ` [PATCH 12/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 [13/15] ARM: pxa: remove the DMA IO resources Robert Jarzmik 2018-04-02 14:26 ` [PATCH 13/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 [15/15] ARM: pxa: change SSP DMA channels allocation Robert Jarzmik 2018-04-02 14:26 ` [PATCH 15/15] " Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 14:26 ` Robert Jarzmik 2018-04-02 16:25 [12/15] dmaengine: pxa: make the filter function internal kbuild test robot 2018-04-02 16:25 ` [PATCH 12/15] " kbuild test robot 2018-04-02 16:25 ` kbuild test robot 2018-04-02 16:25 ` kbuild test robot 2018-04-02 16:25 ` kbuild test robot 2018-04-02 16:35 [12/15] " kbuild test robot 2018-04-02 16:35 ` [PATCH 12/15] " kbuild test robot 2018-04-02 16:35 ` kbuild test robot 2018-04-02 16:35 ` kbuild test robot 2018-04-02 16:35 ` kbuild test robot 2018-04-02 16:35 ` kbuild test robot 2018-04-02 18:46 [15/15] ARM: pxa: change SSP DMA channels allocation kbuild test robot 2018-04-02 18:46 ` [PATCH 15/15] " kbuild test robot 2018-04-02 18:46 ` kbuild test robot 2018-04-02 18:46 ` kbuild test robot 2018-04-02 18:46 ` kbuild test robot 2018-04-03 6:51 [02/15] ARM: pxa: add dma slave map Arnd Bergmann 2018-04-03 6:51 ` [PATCH 02/15] " Arnd Bergmann 2018-04-03 6:51 ` Arnd Bergmann 2018-04-03 6:51 ` Arnd Bergmann 2018-04-03 6:51 ` Arnd Bergmann 2018-04-03 6:51 ` Arnd Bergmann 2018-04-03 7:13 [12/15] dmaengine: pxa: make the filter function internal Arnd Bergmann 2018-04-03 7:13 ` [PATCH 12/15] " Arnd Bergmann 2018-04-03 7:13 ` Arnd Bergmann 2018-04-03 7:13 ` Arnd Bergmann 2018-04-03 7:13 ` Arnd Bergmann 2018-04-03 7:13 ` Arnd Bergmann 2018-04-03 15:18 [02/15] ARM: pxa: add dma slave map Robert Jarzmik 2018-04-03 15:18 ` [PATCH 02/15] " Robert Jarzmik 2018-04-03 15:18 ` Robert Jarzmik 2018-04-03 15:18 ` Robert Jarzmik 2018-04-03 15:18 ` Robert Jarzmik 2018-04-03 15:39 [02/15] " Arnd Bergmann 2018-04-03 15:39 ` [PATCH 02/15] " Arnd Bergmann 2018-04-03 15:39 ` Arnd Bergmann 2018-04-03 15:39 ` Arnd Bergmann 2018-04-03 15:39 ` Arnd Bergmann 2018-04-03 15:39 ` Arnd Bergmann 2018-04-03 20:19 [02/15] " Robert Jarzmik 2018-04-03 20:19 ` [PATCH 02/15] " Robert Jarzmik 2018-04-03 20:19 ` Robert Jarzmik 2018-04-04 10:18 [02/15] " Arnd Bergmann 2018-04-04 10:18 ` [PATCH 02/15] " Arnd Bergmann 2018-04-04 10:18 ` Arnd Bergmann 2018-04-04 19:21 [02/15] " Robert Jarzmik 2018-04-04 19:21 ` [PATCH 02/15] " Robert Jarzmik 2018-04-04 19:21 ` Robert Jarzmik 2018-04-12 15:26 [08/15] ASoC: pxa: remove the dmaengine compat need Mark Brown 2018-04-12 15:26 ` [PATCH 08/15] " Mark Brown 2018-04-12 15:26 ` Mark Brown 2018-04-12 15:26 ` Mark Brown 2018-04-12 15:26 ` Mark Brown 2018-04-12 15:26 ` Mark Brown 2018-04-12 16:55 [08/15] " Robert Jarzmik 2018-04-12 16:55 ` [PATCH 08/15] " Robert Jarzmik 2018-04-12 16:55 ` Robert Jarzmik 2018-04-12 16:55 ` Robert Jarzmik 2018-04-12 16:55 ` Robert Jarzmik 2018-04-12 16:55 ` Robert Jarzmik 2018-04-22 6:13 [01/15] dmaengine: pxa: use a dma slave map Vinod Koul 2018-04-22 6:13 ` [PATCH 01/15] " Vinod Koul 2018-04-22 6:13 ` Vinod Koul 2018-04-22 11:06 [04/15] media: pxa_camera: remove the dmaengine compat need Hans Verkuil 2018-04-22 11:06 ` [PATCH 04/15] " Hans Verkuil 2018-04-22 11:06 ` Hans Verkuil 2018-04-22 11:06 ` Hans Verkuil 2018-04-23 8:37 [09/15] net: irda: pxaficp_ir: " Greg Kroah-Hartman 2018-04-23 8:37 ` [PATCH 09/15] " Greg Kroah-Hartman 2018-04-23 8:37 ` Greg Kroah-Hartman 2018-04-23 8:37 ` Greg Kroah-Hartman 2018-04-23 8:37 ` Greg Kroah-Hartman 2018-05-04 19:29 [04/15] media: pxa_camera: " Mauro Carvalho Chehab 2018-05-04 19:29 ` [PATCH 04/15] " Mauro Carvalho Chehab 2018-05-04 19:29 ` Mauro Carvalho Chehab 2018-05-04 19:29 ` Mauro Carvalho Chehab 2018-05-04 19:29 ` Mauro Carvalho Chehab 2018-05-18 21:31 [05/15] mtd: nand: pxa3xx: " Daniel Mack 2018-05-18 21:31 ` [PATCH 05/15] " Daniel Mack 2018-05-18 21:31 ` Daniel Mack 2018-05-18 21:31 ` Daniel Mack 2018-05-23 21:54 [05/15] " Daniel Mack 2018-05-23 21:54 ` [PATCH 05/15] " Daniel Mack 2018-05-23 21:54 ` Daniel Mack 2018-05-23 21:54 ` Daniel Mack
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=dcd81a87-ca7a-3bc8-c457-320d4ce60a83@xs4all.nl \ --to=hverkuil@xs4all.nl \ --cc=arnd@arndb.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=robert.jarzmik@free.fr \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.