diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2014-01-31 14:57:27 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-25 18:03:02 +0200 |
| commit | 5ef54b5955acdcc63ac8ad7cf0aef3d16070773a (patch) | |
| tree | 5e3ca1717c4ebffe2c28f71f8670ba76306c3c0f | |
| parent | [media] adv7604: Support hot-plug detect control through a GPIO (diff) | |
| download | linux-5ef54b5955acdcc63ac8ad7cf0aef3d16070773a.tar.xz linux-5ef54b5955acdcc63ac8ad7cf0aef3d16070773a.zip | |
[media] adv7604: Specify the default input through platform data
And set input routing when initializing the device.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
| -rw-r--r-- | drivers/media/i2c/adv7604.c | 7 | ||||
| -rw-r--r-- | include/media/adv7604.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c index b14dc7d4b7bb..342d73d3989b 100644 --- a/drivers/media/i2c/adv7604.c +++ b/drivers/media/i2c/adv7604.c @@ -2441,6 +2441,13 @@ static int adv7604_core_init(struct v4l2_subdev *sd) disable_input(sd); + if (pdata->default_input >= 0 && + pdata->default_input < state->source_pad) { + state->selected_input = pdata->default_input; + select_input(sd); + enable_input(sd); + } + /* power */ io_write(sd, 0x0c, 0x42); /* Power up part and power down VDP */ io_write(sd, 0x0b, 0x44); /* Power down ESDP block */ diff --git a/include/media/adv7604.h b/include/media/adv7604.h index 276135b7faa3..40b4ae04ff8e 100644 --- a/include/media/adv7604.h +++ b/include/media/adv7604.h @@ -104,6 +104,8 @@ struct adv7604_platform_data { /* DIS_CABLE_DET_RST: 1 if the 5V pins are unused and unconnected */ unsigned disable_cable_det_rst:1; + int default_input; + /* Analog input muxing mode */ enum adv7604_ain_sel ain_sel; |