Commit fc9bd1ce authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: msp3400: declare its own pads 



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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 44fd653b

drivers/media/i2c/msp3400-driver.c

+4 −4
Original line number Diff line number Diff line
@@ -703,10 +703,10 @@ static int msp_probe(struct i2c_client *client, const struct i2c_device_id *id) 
	v4l2_i2c_subdev_init(sd, client, &msp_ops);



#if defined(CONFIG_MEDIA_CONTROLLER)

	state->pads[IF_AUD_DEC_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;

	state->pads[IF_AUD_DEC_PAD_IF_INPUT].sig_type = PAD_SIGNAL_AUDIO;

	state->pads[IF_AUD_DEC_PAD_OUT].flags = MEDIA_PAD_FL_SOURCE;

	state->pads[IF_AUD_DEC_PAD_OUT].sig_type = PAD_SIGNAL_AUDIO;

	state->pads[MSP3400_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;

	state->pads[MSP3400_PAD_IF_INPUT].sig_type = PAD_SIGNAL_AUDIO;

	state->pads[MSP3400_PAD_OUT].flags = MEDIA_PAD_FL_SOURCE;

	state->pads[MSP3400_PAD_OUT].sig_type = PAD_SIGNAL_AUDIO;



	sd->entity.function = MEDIA_ENT_F_IF_AUD_DECODER;

drivers/media/i2c/msp3400-driver.h

+7 −1
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ extern int msp_standard; 
extern bool msp_dolby;

extern int msp_stereo_thresh;



enum msp3400_pads {

	MSP3400_PAD_IF_INPUT,

	MSP3400_PAD_OUT,

	MSP3400_NUM_PADS

};



struct msp_state {

	struct v4l2_subdev sd;

	struct v4l2_ctrl_handler hdl;
@@ -106,7 +112,7 @@ struct msp_state { 
	unsigned int         watch_stereo:1;



#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)

	struct media_pad pads[IF_AUD_DEC_PAD_NUM_PADS];

	struct media_pad pads[MSP3400_NUM_PADS];

#endif

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE