diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-02-15 13:12:01 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-19 15:16:41 -0400 |
commit | a8451ed205774398084de4a71e6794b86c94b5e5 (patch) | |
tree | 658f717e0a310389438ef1c87bcaf4708b919aba | |
parent | db242f62bd18f6c689c0e04f3df14be2deb89462 (diff) |
[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>
-rw-r--r-- | arch/blackfin/mach-bf609/boards/ezkit.c | 8 | ||||
-rw-r--r-- | 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 61c1f47a4bf2..97d701639585 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[] = { | |||
936 | .index = 2, | 936 | .index = 2, |
937 | .name = "Component", | 937 | .name = "Component", |
938 | .type = V4L2_INPUT_TYPE_CAMERA, | 938 | .type = V4L2_INPUT_TYPE_CAMERA, |
939 | .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS, | 939 | .capabilities = V4L2_IN_CAP_DV_TIMINGS, |
940 | }, | 940 | }, |
941 | { | 941 | { |
942 | .index = 3, | 942 | .index = 3, |
943 | .name = "VGA", | 943 | .name = "VGA", |
944 | .type = V4L2_INPUT_TYPE_CAMERA, | 944 | .type = V4L2_INPUT_TYPE_CAMERA, |
945 | .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS, | 945 | .capabilities = V4L2_IN_CAP_DV_TIMINGS, |
946 | }, | 946 | }, |
947 | { | 947 | { |
948 | .index = 4, | 948 | .index = 4, |
949 | .name = "HDMI", | 949 | .name = "HDMI", |
950 | .type = V4L2_INPUT_TYPE_CAMERA, | 950 | .type = V4L2_INPUT_TYPE_CAMERA, |
951 | .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS, | 951 | .capabilities = V4L2_IN_CAP_DV_TIMINGS, |
952 | }, | 952 | }, |
953 | }; | 953 | }; |
954 | 954 | ||
@@ -1074,7 +1074,7 @@ static struct v4l2_output adv7511_outputs[] = { | |||
1074 | .index = 0, | 1074 | .index = 0, |
1075 | .name = "HDMI", | 1075 | .name = "HDMI", |
1076 | .type = V4L2_INPUT_TYPE_CAMERA, | 1076 | .type = V4L2_INPUT_TYPE_CAMERA, |
1077 | .capabilities = V4L2_OUT_CAP_CUSTOM_TIMINGS, | 1077 | .capabilities = V4L2_OUT_CAP_DV_TIMINGS, |
1078 | }, | 1078 | }, |
1079 | }; | 1079 | }; |
1080 | 1080 | ||
diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c index 8ffe42aabd85..476cfc88d144 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) | |||
384 | params.ppi_control = bcap_dev->cfg->ppi_control; | 384 | params.ppi_control = bcap_dev->cfg->ppi_control; |
385 | params.int_mask = bcap_dev->cfg->int_mask; | 385 | params.int_mask = bcap_dev->cfg->int_mask; |
386 | if (bcap_dev->cfg->inputs[bcap_dev->cur_input].capabilities | 386 | if (bcap_dev->cfg->inputs[bcap_dev->cur_input].capabilities |
387 | & V4L2_IN_CAP_CUSTOM_TIMINGS) { | 387 | & V4L2_IN_CAP_DV_TIMINGS) { |
388 | struct v4l2_bt_timings *bt = &bcap_dev->dv_timings.bt; | 388 | struct v4l2_bt_timings *bt = &bcap_dev->dv_timings.bt; |
389 | 389 | ||
390 | params.hdelay = bt->hsync + bt->hbackporch; | 390 | params.hdelay = bt->hsync + bt->hbackporch; |
@@ -1111,7 +1111,7 @@ static int bcap_probe(struct platform_device *pdev) | |||
1111 | } | 1111 | } |
1112 | bcap_dev->std = std; | 1112 | bcap_dev->std = std; |
1113 | } | 1113 | } |
1114 | if (config->inputs[0].capabilities & V4L2_IN_CAP_CUSTOM_TIMINGS) { | 1114 | if (config->inputs[0].capabilities & V4L2_IN_CAP_DV_TIMINGS) { |
1115 | struct v4l2_dv_timings dv_timings; | 1115 | struct v4l2_dv_timings dv_timings; |
1116 | ret = v4l2_subdev_call(bcap_dev->sd, video, | 1116 | ret = v4l2_subdev_call(bcap_dev->sd, video, |
1117 | g_dv_timings, &dv_timings); | 1117 | g_dv_timings, &dv_timings); |