aboutsummaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-20 09:06:25 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-05 22:02:34 -0300
commit7aaad13124598580dbce98d33618e9356412274c (patch)
treeb1da481319dec1620a6836c81749fdec08ac003f /include/media
parent33bf1786602d819dc0467e77816dfa3f2a7e459d (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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/davinci/vpif_types.h b/include/media/davinci/vpif_types.h
index 1fe46a51de7..a422ed085cd 100644
--- a/include/media/davinci/vpif_types.h
+++ b/include/media/davinci/vpif_types.h
@@ -37,8 +37,6 @@ struct vpif_interface {
struct vpif_subdev_info {
const char *name;
struct i2c_board_info board_info;
- u32 input;
- u32 output;
struct vpif_interface vpif_if;
};
@@ -56,6 +54,8 @@ struct vpif_display_config {
struct vpif_input {
struct v4l2_input input;
const char *subdev_name;
+ u32 input_route;
+ u32 output_route;
};
struct vpif_capture_chan_config {