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

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
...@@ -467,14 +467,15 @@ static int si2157_probe(struct i2c_client *client, ...@@ -467,14 +467,15 @@ static int si2157_probe(struct i2c_client *client,
dev->ent.name = KBUILD_MODNAME; dev->ent.name = KBUILD_MODNAME;
dev->ent.function = MEDIA_ENT_F_TUNER; 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[SI2157_PAD_RF_INPUT].flags = MEDIA_PAD_FL_SINK;
dev->pad[TUNER_PAD_OUTPUT].flags = MEDIA_PAD_FL_SOURCE; dev->pad[SI2157_PAD_RF_INPUT].sig_type = PAD_SIGNAL_ANALOG;
dev->pad[TUNER_PAD_OUTPUT].sig_type = PAD_SIGNAL_ANALOG; dev->pad[SI2157_PAD_VID_OUT].flags = MEDIA_PAD_FL_SOURCE;
dev->pad[TUNER_PAD_AUD_OUT].flags = MEDIA_PAD_FL_SOURCE; dev->pad[SI2157_PAD_VID_OUT].sig_type = PAD_SIGNAL_ANALOG;
dev->pad[TUNER_PAD_AUD_OUT].sig_type = PAD_SIGNAL_AUDIO; 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, TUNER_NUM_PADS,
ret = media_entity_pads_init(&dev->ent, SI2157_NUM_PADS,
&dev->pad[0]); &dev->pad[0]);
if (ret) if (ret)
......
...@@ -21,6 +21,13 @@ ...@@ -21,6 +21,13 @@
#include <media/v4l2-mc.h> #include <media/v4l2-mc.h>
#include "si2157.h" #include "si2157.h"
enum si2157_pads {
SI2157_PAD_RF_INPUT,
SI2157_PAD_VID_OUT,
SI2157_PAD_AUD_OUT,
SI2157_NUM_PADS
};
/* state struct */ /* state struct */
struct si2157_dev { struct si2157_dev {
struct mutex i2c_mutex; struct mutex i2c_mutex;
...@@ -35,7 +42,7 @@ struct si2157_dev { ...@@ -35,7 +42,7 @@ struct si2157_dev {
#if defined(CONFIG_MEDIA_CONTROLLER) #if defined(CONFIG_MEDIA_CONTROLLER)
struct media_device *mdev; struct media_device *mdev;
struct media_entity ent; struct media_entity ent;
struct media_pad pad[TUNER_NUM_PADS]; struct media_pad pad[SI2157_NUM_PADS];
#endif #endif
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment