raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

media: adv7180: Default to the first valid input

Browse Source 
The hardware default is differential CVBS on AIN1 & 2, which
isn't very useful.

Select the first input that is defined as valid for the
chip variant (typically CVBS_AIN1).

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
This commit is contained in:
Dave Stevenson
2018-10-31 14:57:46 +00:00
committed by Dom Cobley
parent 511fa23c4e
commit c864954870
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/i2c/adv7180.c
View File

@@ -852,6 +852,9 @@ static int init_device(struct adv7180_state *state)
return ret; return ret;
adv7180_set_field_mode(state); adv7180_set_field_mode(state);
ret = state->chip_info->select_input(state, state->input);
if (ret)
return ret;
__v4l2_ctrl_handler_setup(&state->ctrl_hdl); __v4l2_ctrl_handler_setup(&state->ctrl_hdl);
@@ -1408,6 +1411,7 @@ static int adv7180_probe(struct i2c_client *client)
struct device_node *np = client->dev.of_node; struct device_node *np = client->dev.of_node;
struct adv7180_state *state; struct adv7180_state *state;
struct v4l2_subdev *sd; struct v4l2_subdev *sd;
unsigned int i;
int ret; int ret;
/* Check if the adapter supports the needed features */ /* Check if the adapter supports the needed features */
@@ -1463,6 +1467,14 @@ static int adv7180_probe(struct i2c_client *client)
state->curr_norm = V4L2_STD_NTSC; state->curr_norm = V4L2_STD_NTSC;
state->input = 0; state->input = 0;
/* Select first valid input */
for (i = 0; i < 32; i++) {
if (BIT(i) & state->chip_info->valid_input_mask) {
state->input = i;
break;
}
}
sd = &state->sd; sd = &state->sd;
v4l2_i2c_subdev_init(sd, client, &adv7180_ops); v4l2_i2c_subdev_init(sd, client, &adv7180_ops);
sd->internal_ops = &adv7180_internal_ops; sd->internal_ops = &adv7180_internal_ops;