diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-10-01 10:39:46 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 13:27:18 -0400 |
commit | 368640827c0be2582d836cd74ae2cff03e6bfc02 (patch) | |
tree | 1012c886f4ce621b6d9284ffac81f3b79c3a95f7 /include/media/davinci/vpbe_types.h | |
parent | 182b967e1119d22889e334c8f1c1b75df41f9165 (diff) |
[media] dm644x: replace the obsolete preset API by the timings API
This patch replaces the preset API by the timings API, and
appropriate changes in board file.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/davinci/vpbe_types.h')
-rw-r--r-- | include/media/davinci/vpbe_types.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/media/davinci/vpbe_types.h b/include/media/davinci/vpbe_types.h index 727f55170e4..9b85396514b 100644 --- a/include/media/davinci/vpbe_types.h +++ b/include/media/davinci/vpbe_types.h | |||
@@ -32,11 +32,6 @@ enum vpbe_enc_timings_type { | |||
32 | VPBE_ENC_TIMINGS_INVALID = 0x8, | 32 | VPBE_ENC_TIMINGS_INVALID = 0x8, |
33 | }; | 33 | }; |
34 | 34 | ||
35 | union vpbe_timings { | ||
36 | v4l2_std_id std_id; | ||
37 | unsigned int dv_preset; | ||
38 | }; | ||
39 | |||
40 | /* | 35 | /* |
41 | * struct vpbe_enc_mode_info | 36 | * struct vpbe_enc_mode_info |
42 | * @name: ptr to name string of the standard, "NTSC", "PAL" etc | 37 | * @name: ptr to name string of the standard, "NTSC", "PAL" etc |
@@ -73,7 +68,8 @@ union vpbe_timings { | |||
73 | struct vpbe_enc_mode_info { | 68 | struct vpbe_enc_mode_info { |
74 | unsigned char *name; | 69 | unsigned char *name; |
75 | enum vpbe_enc_timings_type timings_type; | 70 | enum vpbe_enc_timings_type timings_type; |
76 | union vpbe_timings timings; | 71 | v4l2_std_id std_id; |
72 | struct v4l2_dv_timings dv_timings; | ||
77 | unsigned int interlaced; | 73 | unsigned int interlaced; |
78 | unsigned int xres; | 74 | unsigned int xres; |
79 | unsigned int yres; | 75 | unsigned int yres; |