mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-12 05:24:12 +08:00
media: saa7134: 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: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
parent
552b926fa3
commit
3aa13787c8
@ -845,13 +845,13 @@ static void saa7134_create_entities(struct saa7134_dev *dev)
|
||||
*/
|
||||
if (!decoder) {
|
||||
dev->demod.name = "saa713x";
|
||||
dev->demod_pad[DEMOD_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;
|
||||
dev->demod_pad[DEMOD_PAD_IF_INPUT].sig_type = PAD_SIGNAL_ANALOG;
|
||||
dev->demod_pad[DEMOD_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
|
||||
dev->demod_pad[DEMOD_PAD_VID_OUT].sig_type = PAD_SIGNAL_DV;
|
||||
dev->demod_pad[SAA7134_PAD_IF_INPUT].flags = MEDIA_PAD_FL_SINK;
|
||||
dev->demod_pad[SAA7134_PAD_IF_INPUT].sig_type = PAD_SIGNAL_ANALOG;
|
||||
dev->demod_pad[SAA7134_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
|
||||
dev->demod_pad[SAA7134_PAD_VID_OUT].sig_type = PAD_SIGNAL_DV;
|
||||
dev->demod.function = MEDIA_ENT_F_ATV_DECODER;
|
||||
|
||||
ret = media_entity_pads_init(&dev->demod, DEMOD_NUM_PADS,
|
||||
ret = media_entity_pads_init(&dev->demod, SAA7134_NUM_PADS,
|
||||
dev->demod_pad);
|
||||
if (ret < 0)
|
||||
pr_err("failed to initialize demod pad!\n");
|
||||
|
@ -547,6 +547,12 @@ struct saa7134_mpeg_ops {
|
||||
unsigned long status);
|
||||
};
|
||||
|
||||
enum saa7134_pads {
|
||||
SAA7134_PAD_IF_INPUT,
|
||||
SAA7134_PAD_VID_OUT,
|
||||
SAA7134_NUM_PADS
|
||||
};
|
||||
|
||||
/* global device status */
|
||||
struct saa7134_dev {
|
||||
struct list_head devlist;
|
||||
@ -674,7 +680,7 @@ struct saa7134_dev {
|
||||
struct media_pad input_pad[SAA7134_INPUT_MAX + 1];
|
||||
|
||||
struct media_entity demod;
|
||||
struct media_pad demod_pad[DEMOD_NUM_PADS];
|
||||
struct media_pad demod_pad[SAA7134_NUM_PADS];
|
||||
|
||||
struct media_pad video_pad, vbi_pad;
|
||||
struct media_entity *decoder;
|
||||
|
Loading…
Reference in New Issue
Block a user