Commit f727b6cd authored by Robert Jarzmik's avatar Robert Jarzmik

media: pxa_camera: remove the dmaengine compat need

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: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 6b3348f9
...@@ -2375,8 +2375,6 @@ static int pxa_camera_probe(struct platform_device *pdev) ...@@ -2375,8 +2375,6 @@ static int pxa_camera_probe(struct platform_device *pdev)
.src_maxburst = 8, .src_maxburst = 8,
.direction = DMA_DEV_TO_MEM, .direction = DMA_DEV_TO_MEM,
}; };
dma_cap_mask_t mask;
struct pxad_param params;
char clk_name[V4L2_CLK_NAME_SIZE]; char clk_name[V4L2_CLK_NAME_SIZE];
int irq; int irq;
int err = 0, i; int err = 0, i;
...@@ -2450,34 +2448,20 @@ static int pxa_camera_probe(struct platform_device *pdev) ...@@ -2450,34 +2448,20 @@ static int pxa_camera_probe(struct platform_device *pdev)
pcdev->base = base; pcdev->base = base;
/* request dma */ /* request dma */
dma_cap_zero(mask); pcdev->dma_chans[0] = dma_request_slave_channel(&pdev->dev, "CI_Y");
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,
&params, &pdev->dev, "CI_Y");
if (!pcdev->dma_chans[0]) { if (!pcdev->dma_chans[0]) {
dev_err(&pdev->dev, "Can't request DMA for Y\n"); dev_err(&pdev->dev, "Can't request DMA for Y\n");
return -ENODEV; return -ENODEV;
} }
params.drcmr = 69; pcdev->dma_chans[1] = dma_request_slave_channel(&pdev->dev, "CI_U");
pcdev->dma_chans[1] =
dma_request_slave_channel_compat(mask, pxad_filter_fn,
&params, &pdev->dev, "CI_U");
if (!pcdev->dma_chans[1]) { if (!pcdev->dma_chans[1]) {
dev_err(&pdev->dev, "Can't request DMA for Y\n"); dev_err(&pdev->dev, "Can't request DMA for Y\n");
err = -ENODEV; err = -ENODEV;
goto exit_free_dma_y; goto exit_free_dma_y;
} }
params.drcmr = 70; pcdev->dma_chans[2] = dma_request_slave_channel(&pdev->dev, "CI_V");
pcdev->dma_chans[2] =
dma_request_slave_channel_compat(mask, pxad_filter_fn,
&params, &pdev->dev, "CI_V");
if (!pcdev->dma_chans[2]) { if (!pcdev->dma_chans[2]) {
dev_err(&pdev->dev, "Can't request DMA for V\n"); dev_err(&pdev->dev, "Can't request DMA for V\n");
err = -ENODEV; err = -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment