Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[media] au0828: use standard demod pads struct 



As we want au0828 to use the core function to create the MC
graphs, use enum demod_pad_index instead of
enum au8522_media_pads.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 078600f5

drivers/media/dvb-frontends/au8522.h

+0 −9
Original line number Diff line number Diff line
@@ -89,13 +89,4 @@ enum au8522_audio_input { 
	AU8522_AUDIO_NONE,

	AU8522_AUDIO_SIF,

};



enum au8522_media_pads {

	AU8522_PAD_INPUT,

	AU8522_PAD_VID_OUT,

	AU8522_PAD_VBI_OUT,

	AU8522_PAD_AUDIO_OUT,



	AU8522_NUM_PADS

};

#endif /* __AU8522_H__ */

drivers/media/dvb-frontends/au8522_decoder.c

+4 −4
Original line number Diff line number Diff line
@@ -763,10 +763,10 @@ static int au8522_probe(struct i2c_client *client, 
	v4l2_i2c_subdev_init(sd, client, &au8522_ops);

#if defined(CONFIG_MEDIA_CONTROLLER)



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

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

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

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

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

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

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

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

	sd->entity.function = MEDIA_ENT_F_ATV_DECODER;



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

drivers/media/dvb-frontends/au8522_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/videodev2.h>

#include <media/v4l2-device.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-mc.h>

#include <linux/i2c.h>

#include "dvb_frontend.h"

#include "au8522.h"
@@ -70,7 +71,7 @@ struct au8522_state { 
	struct v4l2_ctrl_handler hdl;



#ifdef CONFIG_MEDIA_CONTROLLER

	struct media_pad pads[AU8522_NUM_PADS];

	struct media_pad pads[DEMOD_NUM_PADS];

#endif

};

drivers/media/usb/au0828/au0828-core.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static void au0828_media_graph_notify(struct media_entity *new, 
	switch (new->function) {

	case MEDIA_ENT_F_AUDIO_MIXER:

		ret = media_create_pad_link(dev->decoder,

					    AU8522_PAD_AUDIO_OUT,

					    DEMOD_PAD_AUDIO_OUT,

					    new, 0,

					    MEDIA_LNK_FL_ENABLED);

		if (ret)

drivers/media/usb/au0828/au0828-video.c

+4 −4
Original line number Diff line number Diff line
@@ -686,16 +686,16 @@ static int au0828_create_media_graph(struct au0828_dev *dev) 
	if (tuner) {

		dev->tuner = tuner;

		ret = media_create_pad_link(tuner, TUNER_PAD_OUTPUT,

					    decoder, AU8522_PAD_INPUT, 0);

					    decoder, DEMOD_PAD_IF_INPUT, 0);

		if (ret)

			return ret;

	}

	ret = media_create_pad_link(decoder, AU8522_PAD_VID_OUT,

	ret = media_create_pad_link(decoder, DEMOD_PAD_VID_OUT,

				    &dev->vdev.entity, 0,

				    MEDIA_LNK_FL_ENABLED);

	if (ret)

		return ret;

	ret = media_create_pad_link(decoder, AU8522_PAD_VBI_OUT,

	ret = media_create_pad_link(decoder, DEMOD_PAD_VBI_OUT,

				    &dev->vbi_dev.entity, 0,

				    MEDIA_LNK_FL_ENABLED);

	if (ret)
@@ -723,7 +723,7 @@ static int au0828_create_media_graph(struct au0828_dev *dev) 
		case AU0828_VMUX_SVIDEO:

			/* FIXME: fix the decoder PAD */

			ret = media_create_pad_link(ent, 0, decoder,

						    AU8522_PAD_INPUT, 0);

						    DEMOD_PAD_IF_INPUT, 0);

			if (ret)

				return ret;

			break;