xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: saa7115: declare its own pads

Browse Source 
As we don't need anymore to share pad numbers with similar
drivers, use its own pad definition instead of a global
model.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab
2018-08-01 06:07:09 -04:00
parent fc9bd1cea5
commit 87f9971710
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/media/i2c/saa7115.c
View File

@@ -59,10 +59,16 @@ enum saa711x_model {
SAA7118, SAA7118,
}; };
enum saa711x_pads {
SAA711X_PAD_IF_INPUT,
SAA711X_PAD_VID_OUT,
SAA711X_NUM_PADS
};
struct saa711x_state { struct saa711x_state {
struct v4l2_subdev sd; struct v4l2_subdev sd;
#ifdef CONFIG_MEDIA_CONTROLLER #ifdef CONFIG_MEDIA_CONTROLLER
struct media_pad pads[DEMOD_NUM_PADS]; struct media_pad pads[SAA711X_NUM_PADS];
#endif #endif
struct v4l2_ctrl_handler hdl; struct v4l2_ctrl_handler hdl;
@@ -1834,14 +1840,15 @@ static int saa711x_probe(struct i2c_client *client,
v4l2_i2c_subdev_init(sd, client, &saa711x_ops); v4l2_i2c_subdev_init(sd, client, &saa711x_ops);
#if defined(CONFIG_MEDIA_CONTROLLER) #if defined(CONFIG_MEDIA_CONTROLLER)
state->pads[DEMOD_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK; state->pads[SAA711X_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;
state->pads[DEMOD_PAD_IF_INPUT].sig_type = PAD_SIGNAL_ANALOG; state->pads[SAA711X_PAD_IF_INPUT].sig_type = PAD_SIGNAL_ANALOG;
state->pads[DEMOD_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE; state->pads[SAA711X_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
state->pads[DEMOD_PAD_VID_OUT].sig_type = PAD_SIGNAL_DV; state->pads[SAA711X_PAD_VID_OUT].sig_type = PAD_SIGNAL_DV;
sd->entity.function = MEDIA_ENT_F_ATV_DECODER; sd->entity.function = MEDIA_ENT_F_ATV_DECODER;
ret = media_entity_pads_init(&sd->entity, DEMOD_NUM_PADS, state->pads); ret = media_entity_pads_init(&sd->entity, SAA711X_NUM_PADS,
state->pads);
if (ret < 0) if (ret < 0)
return ret; return ret;
#endif #endif