media: au8522: declare its own pads (44fd653b) · Commits · 戴 / test

drivers/media/dvb-frontends/au8522_decoder.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -718,12 +718,12 @@ static int au8522_probe(struct i2c_client *client,
		v4l2_i2c_subdev_init(sd, client, &au8522_ops);
		#if defined(CONFIG_MEDIA_CONTROLLER)

		state->pads[DEMOD_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;
		state->pads[DEMOD_PAD_IF_INPUT].sig_type = PAD_SIGNAL_ANALOG;
		state->pads[DEMOD_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
		state->pads[DEMOD_PAD_VID_OUT].sig_type = PAD_SIGNAL_DV;
		state->pads[DEMOD_PAD_AUDIO_OUT].flags = MEDIA_PAD_FL_SOURCE;
		state->pads[DEMOD_PAD_AUDIO_OUT].sig_type = PAD_SIGNAL_AUDIO;
		state->pads[AU8522_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;
		state->pads[AU8522_PAD_IF_INPUT].sig_type = PAD_SIGNAL_ANALOG;
		state->pads[AU8522_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
		state->pads[AU8522_PAD_VID_OUT].sig_type = PAD_SIGNAL_DV;
		state->pads[AU8522_PAD_AUDIO_OUT].flags = MEDIA_PAD_FL_SOURCE;
		state->pads[AU8522_PAD_AUDIO_OUT].sig_type = PAD_SIGNAL_AUDIO;
		sd->entity.function = MEDIA_ENT_F_ATV_DECODER;

		ret = media_entity_pads_init(&sd->entity, ARRAY_SIZE(state->pads),

+8 −1

Original line number	Diff line number	Diff line
		@@ -40,6 +40,13 @@
		#define AU8522_DIGITAL_MODE 1
		#define AU8522_SUSPEND_MODE 2

		enum au8522_pads {
		AU8522_PAD_IF_INPUT,
		AU8522_PAD_VID_OUT,
		AU8522_PAD_AUDIO_OUT,
		AU8522_NUM_PADS
		};

		struct au8522_state {
		struct i2c_client *c;
		struct i2c_adapter *i2c;
		@@ -71,7 +78,7 @@ struct au8522_state {
		struct v4l2_ctrl_handler hdl;

		#ifdef CONFIG_MEDIA_CONTROLLER
		struct media_pad pads[DEMOD_NUM_PADS];
		struct media_pad pads[AU8522_NUM_PADS];
		#endif
		};