]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
v4l: xilinx: dma: Cleanup unused vdma configuration.
authorRadhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Tue, 18 Nov 2014 14:13:14 +0000 (19:43 +0530)
committerMichal Simek <michal.simek@xilinx.com>
Mon, 15 Dec 2014 06:19:10 +0000 (07:19 +0100)
Remove DMA_SLAVE_CONFIG call as setting vdma channel params 'reset, park
and ext_fsync' is no longer required. However at a later point for
configuring any vdma channel param (i.e non-cyclic mode) we should use
xilinx_vdma_channel_set_config().

Signed-off-by: Radhey Shyam Pandey <radheys@xilinx.com>
Reviewed-by: Hyun Kwon <hyun.kwon@xilinx.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
drivers/media/platform/xilinx/xilinx-dma.c

index ae2026b98405e2451c56760de17df1be6788d518..80ba31294a1f0796718298e1b33f8a0a0b683d35 100644 (file)
@@ -473,7 +473,6 @@ static void xvip_dma_stop_streaming(struct vb2_queue *vq)
        struct xvip_dma *dma = vb2_get_drv_priv(vq);
        struct xvip_pipeline *pipe = to_xvip_pipeline(&dma->video.entity);
        struct xvip_dma_buffer *buf, *nbuf;
-       struct xilinx_vdma_config config;
 
        /* Stop the pipeline. */
        xvip_pipeline_set_stream(pipe, false);
@@ -481,11 +480,6 @@ static void xvip_dma_stop_streaming(struct vb2_queue *vq)
        /* Stop and reset the DMA engine. */
        dmaengine_device_control(dma->dma, DMA_TERMINATE_ALL, 0);
 
-       config.reset = 1;
-
-       dmaengine_device_control(dma->dma, DMA_SLAVE_CONFIG,
-                                (unsigned long)&config);
-
        /* Cleanup the pipeline and mark it as being stopped. */
        xvip_pipeline_cleanup(pipe);
        media_entity_pipeline_stop(&dma->video.entity);
@@ -634,7 +628,6 @@ xvip_dma_set_format(struct file *file, void *fh, struct v4l2_format *format)
        struct v4l2_fh *vfh = file->private_data;
        struct xvip_dma *dma = to_xvip_dma(vfh->vdev);
        const struct xvip_video_format *info;
-       struct xilinx_vdma_config config;
 
        __xvip_dma_try_format(dma, &format->fmt.pix, &info);
 
@@ -644,16 +637,6 @@ xvip_dma_set_format(struct file *file, void *fh, struct v4l2_format *format)
        dma->format = format->fmt.pix;
        dma->fmtinfo = info;
 
-       /* Configure the DMA engine. */
-       memset(&config, 0, sizeof(config));
-
-       config.park = 1;
-       config.park_frm = 0;
-       config.ext_fsync = 2;
-
-       dmaengine_device_control(dma->dma, DMA_SLAVE_CONFIG,
-                                (unsigned long)&config);
-
        return 0;
 }