[media] blackfin: replace V4L2_IN/OUT_CAP_CUSTOM_TIMINGS by DV_TIMINGS

The use of V4L2_IN/OUT_CAP_CUSTOM_TIMINGS is obsolete, use DV_TIMINGS instead.
Note that V4L2_IN/OUT_CAP_CUSTOM_TIMINGS is just a #define for
V4L2_IN/OUT_CAP_DV_TIMINGS.
At some point in the future these CUSTOM_TIMINGS defines might be removed.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Scott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c
index 61c1f47a4bf2969f38559746192e7a5a41004c8e..97d701639585241dbac5b47d350c2552008c0656 100644 (file)
--- a/arch/blackfin/mach-bf609/boards/ezkit.c
+++ b/arch/blackfin/mach-bf609/boards/ezkit.c
@@ -936,19 +936,19 @@ static struct v4l2_input adv7842_inputs[] = {
                .index = 2,
                .name = "Component",
                .type = V4L2_INPUT_TYPE_CAMERA,
-               .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS,
+               .capabilities = V4L2_IN_CAP_DV_TIMINGS,
        },
        {
                .index = 3,
                .name = "VGA",
                .type = V4L2_INPUT_TYPE_CAMERA,
-               .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS,
+               .capabilities = V4L2_IN_CAP_DV_TIMINGS,
        },
        {
                .index = 4,
                .name = "HDMI",
                .type = V4L2_INPUT_TYPE_CAMERA,
-               .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS,
+               .capabilities = V4L2_IN_CAP_DV_TIMINGS,
        },
 };
 
@@ -1074,7 +1074,7 @@ static struct v4l2_output adv7511_outputs[] = {
                .index = 0,
                .name = "HDMI",
                .type = V4L2_INPUT_TYPE_CAMERA,
-               .capabilities = V4L2_OUT_CAP_CUSTOM_TIMINGS,
+               .capabilities = V4L2_OUT_CAP_DV_TIMINGS,
        },
 };
 

diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c
index 8ffe42aabd85b9af7cb004e6ea2640b5b7945c4c..476cfc88d1443a43ac142e388ee1281c0360cc39 100644 (file)
--- a/drivers/media/platform/blackfin/bfin_capture.c
+++ b/drivers/media/platform/blackfin/bfin_capture.c
@@ -384,7 +384,7 @@ static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count)
        params.ppi_control = bcap_dev->cfg->ppi_control;
        params.int_mask = bcap_dev->cfg->int_mask;
        if (bcap_dev->cfg->inputs[bcap_dev->cur_input].capabilities
-                       & V4L2_IN_CAP_CUSTOM_TIMINGS) {
+                       & V4L2_IN_CAP_DV_TIMINGS) {
                struct v4l2_bt_timings *bt = &bcap_dev->dv_timings.bt;
 
                params.hdelay = bt->hsync + bt->hbackporch;
@@ -1111,7 +1111,7 @@ static int bcap_probe(struct platform_device *pdev)
                }
                bcap_dev->std = std;
        }
-       if (config->inputs[0].capabilities & V4L2_IN_CAP_CUSTOM_TIMINGS) {
+       if (config->inputs[0].capabilities & V4L2_IN_CAP_DV_TIMINGS) {
                struct v4l2_dv_timings dv_timings;
                ret = v4l2_subdev_call(bcap_dev->sd, video,
                                g_dv_timings, &dv_timings);