2013/2/16 Hans Verkuil <hverkuil@xxxxxxxxx>:
> From: Hans Verkuil <hans.verkuil@xxxxxxxxx>
>
> 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@xxxxxxxxx>
> Cc: Scott Jiang <scott.jiang.linux@xxxxxxxxx>
Acked-by: Scott Jiang <scott.jiang.linux@xxxxxxxxx>
> ---
> arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++----
> drivers/media/platform/blackfin/bfin_capture.c | 4 ++--
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c
> index 61c1f47..97d7016 100644
> --- 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 5f209d5..6691355 100644
> --- 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;
> @@ -1110,7 +1110,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);
> --
> 1.7.10.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
