diff options
| author | Mauro Carvalho Chehab | 2015-01-03 19:22:26 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2015-02-14 00:10:15 +0100 |
| commit | d35a9855a8b6e675013bce6946e36c13db66b765 (patch) | |
| tree | de3633aa326c77f0d07e4a5a07c7f31990f60188 | |
| parent | [media] cx231xx: initialize video/vbi pads (diff) | |
| download | kernel-qcow2-linux-d35a9855a8b6e675013bce6946e36c13db66b765.tar.gz kernel-qcow2-linux-d35a9855a8b6e675013bce6946e36c13db66b765.tar.xz kernel-qcow2-linux-d35a9855a8b6e675013bce6946e36c13db66b765.zip | |
[media] cx231xx: create media links for analog mode
Now that we have entities and pads, let's create media links
between them, for analog setup.
We may not have all the links for digital yet, as the dvb extention
may not be loaded yet.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-cards.c | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c index d357e8c0c485..dfc7010cff7f 100644 --- a/drivers/media/usb/cx231xx/cx231xx-cards.c +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c @@ -1159,6 +1159,42 @@ static void cx231xx_media_device_register(struct cx231xx *dev, #endif } +static void cx231xx_create_media_graph(struct cx231xx *dev) +{ +#ifdef CONFIG_MEDIA_CONTROLLER + struct media_device *mdev = dev->media_dev; + struct media_entity *entity; + struct media_entity *tuner = NULL, *decoder = NULL; + + if (!mdev) + return; + + media_device_for_each_entity(entity, mdev) { + switch (entity->type) { + case MEDIA_ENT_T_V4L2_SUBDEV_TUNER: + tuner = entity; + break; + case MEDIA_ENT_T_V4L2_SUBDEV_DECODER: + decoder = entity; + break; + } + } + + /* Analog setup, using tuner as a link */ + + if (!decoder) + return; + + if (tuner) + media_entity_create_link(tuner, 0, decoder, 0, + MEDIA_LNK_FL_ENABLED); + media_entity_create_link(decoder, 1, &dev->vdev->entity, 0, + MEDIA_LNK_FL_ENABLED); + media_entity_create_link(decoder, 2, &dev->vbi_dev->entity, 0, + MEDIA_LNK_FL_ENABLED); +#endif +} + /* * cx231xx_init_dev() * allocates and inits the device structs, registers i2c bus and v4l device @@ -1616,6 +1652,8 @@ static int cx231xx_usb_probe(struct usb_interface *interface, /* load other modules required */ request_modules(dev); + cx231xx_create_media_graph(dev); + return 0; err_video_alt: /* cx231xx_uninit_dev: */ |