diff options
Diffstat (limited to 'include/media/v4l2-subdev.h')
-rw-r--r-- | include/media/v4l2-subdev.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index b4e48dc3f2ba..df4a76800bd6 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h | |||
@@ -37,12 +37,6 @@ struct v4l2_decode_vbi_line { | |||
37 | u32 type; /* VBI service type (V4L2_SLICED_*). 0 if no service found */ | 37 | u32 type; /* VBI service type (V4L2_SLICED_*). 0 if no service found */ |
38 | }; | 38 | }; |
39 | 39 | ||
40 | /* s_crystal_freq */ | ||
41 | struct v4l2_crystal_freq { | ||
42 | u32 freq; /* frequency in Hz of the crystal */ | ||
43 | u32 flags; /* device specific flags */ | ||
44 | }; | ||
45 | |||
46 | /* Sub-devices are devices that are connected somehow to the main bridge | 40 | /* Sub-devices are devices that are connected somehow to the main bridge |
47 | device. These devices are usually audio/video muxers/encoders/decoders or | 41 | device. These devices are usually audio/video muxers/encoders/decoders or |
48 | sensors and webcam controllers. | 42 | sensors and webcam controllers. |
@@ -194,8 +188,8 @@ struct v4l2_subdev_audio_ops { | |||
194 | s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by | 188 | s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by |
195 | video input devices. | 189 | video input devices. |
196 | 190 | ||
197 | s_crystal_freq: sets the frequency of the crystal used to generate the | 191 | s_crystal_freq: sets the frequency of the crystal used to generate the |
198 | clocks. An extra flags field allows device specific configuration | 192 | clocks in Hz. An extra flags field allows device specific configuration |
199 | regarding clock frequency dividers, etc. If not used, then set flags | 193 | regarding clock frequency dividers, etc. If not used, then set flags |
200 | to 0. If the frequency is not supported, then -EINVAL is returned. | 194 | to 0. If the frequency is not supported, then -EINVAL is returned. |
201 | 195 | ||
@@ -207,7 +201,7 @@ struct v4l2_subdev_audio_ops { | |||
207 | */ | 201 | */ |
208 | struct v4l2_subdev_video_ops { | 202 | struct v4l2_subdev_video_ops { |
209 | int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route); | 203 | int (*s_routing)(struct v4l2_subdev *sd, const struct v4l2_routing *route); |
210 | int (*s_crystal_freq)(struct v4l2_subdev *sd, struct v4l2_crystal_freq *freq); | 204 | int (*s_crystal_freq)(struct v4l2_subdev *sd, u32 freq, u32 flags); |
211 | int (*decode_vbi_line)(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi_line); | 205 | int (*decode_vbi_line)(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi_line); |
212 | int (*s_vbi_data)(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *vbi_data); | 206 | int (*s_vbi_data)(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *vbi_data); |
213 | int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data); | 207 | int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data); |