Commit 552b926f authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: si2157: 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 bc322c0d

drivers/media/tuners/si2157.c

+9 −8
Original line number Diff line number Diff line
@@ -467,14 +467,15 @@ static int si2157_probe(struct i2c_client *client, 


		dev->ent.name = KBUILD_MODNAME;

		dev->ent.function = MEDIA_ENT_F_TUNER;

		dev->pad[TUNER_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;

		dev->pad[TUNER_PAD_RF_INPUT].sig_type = PAD_SIGNAL_ANALOG;

		dev->pad[TUNER_PAD_OUTPUT].flags = MEDIA_PAD_FL_SOURCE;

		dev->pad[TUNER_PAD_OUTPUT].sig_type = PAD_SIGNAL_ANALOG;

		dev->pad[TUNER_PAD_AUD_OUT].flags = MEDIA_PAD_FL_SOURCE;

		dev->pad[TUNER_PAD_AUD_OUT].sig_type = PAD_SIGNAL_AUDIO;



		ret = media_entity_pads_init(&dev->ent, TUNER_NUM_PADS,



		dev->pad[SI2157_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;

		dev->pad[SI2157_PAD_RF_INPUT].sig_type = PAD_SIGNAL_ANALOG;

		dev->pad[SI2157_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;

		dev->pad[SI2157_PAD_VID_OUT].sig_type = PAD_SIGNAL_ANALOG;

		dev->pad[SI2157_PAD_AUD_OUT].flags = MEDIA_PAD_FL_SOURCE;

		dev->pad[SI2157_PAD_AUD_OUT].sig_type = PAD_SIGNAL_AUDIO;



		ret = media_entity_pads_init(&dev->ent, SI2157_NUM_PADS,

					     &dev->pad[0]);



		if (ret)

drivers/media/tuners/si2157_priv.h

+8 −1
Original line number Diff line number Diff line
@@ -21,6 +21,13 @@ 
#include <media/v4l2-mc.h>

#include "si2157.h"



enum si2157_pads {

	SI2157_PAD_RF_INPUT,

	SI2157_PAD_VID_OUT,

	SI2157_PAD_AUD_OUT,

	SI2157_NUM_PADS

};



/* state struct */

struct si2157_dev {

	struct mutex i2c_mutex;
@@ -35,7 +42,7 @@ struct si2157_dev { 
#if defined(CONFIG_MEDIA_CONTROLLER)

	struct media_device	*mdev;

	struct media_entity	ent;

	struct media_pad	pad[TUNER_NUM_PADS];

	struct media_pad	pad[SI2157_NUM_PADS];

#endif



};

CRA Git | Maintained and supported by SUSTech CRA and CCSE