Commit a8451ed2 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarScott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent db242f62

arch/blackfin/mach-bf609/boards/ezkit.c

+4 −4
Original line number Diff line number Diff line
@@ -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,

	},

};

drivers/media/platform/blackfin/bfin_capture.c

+2 −2
Original line number Diff line number Diff line
@@ -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);