diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-09-20 08:06:25 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 21:02:34 -0400 |
commit | 7aaad13124598580dbce98d33618e9356412274c (patch) | |
tree | b1da481319dec1620a6836c81749fdec08ac003f /include/media | |
parent | 33bf1786602d819dc0467e77816dfa3f2a7e459d (diff) |
[media] vpif_capture: move routing info from subdev to input
Routing information is a property of the input, not of the subdev.
One subdev may provide multiple inputs, each with its own routing
information.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Tested-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/davinci/vpif_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/davinci/vpif_types.h b/include/media/davinci/vpif_types.h index 1fe46a51de7c..a422ed085cd2 100644 --- a/include/media/davinci/vpif_types.h +++ b/include/media/davinci/vpif_types.h | |||
@@ -37,8 +37,6 @@ struct vpif_interface { | |||
37 | struct vpif_subdev_info { | 37 | struct vpif_subdev_info { |
38 | const char *name; | 38 | const char *name; |
39 | struct i2c_board_info board_info; | 39 | struct i2c_board_info board_info; |
40 | u32 input; | ||
41 | u32 output; | ||
42 | struct vpif_interface vpif_if; | 40 | struct vpif_interface vpif_if; |
43 | }; | 41 | }; |
44 | 42 | ||
@@ -56,6 +54,8 @@ struct vpif_display_config { | |||
56 | struct vpif_input { | 54 | struct vpif_input { |
57 | struct v4l2_input input; | 55 | struct v4l2_input input; |
58 | const char *subdev_name; | 56 | const char *subdev_name; |
57 | u32 input_route; | ||
58 | u32 output_route; | ||
59 | }; | 59 | }; |
60 | 60 | ||
61 | struct vpif_capture_chan_config { | 61 | struct vpif_capture_chan_config { |