diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-02-05 08:33:04 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-02-10 07:23:44 -0200 |
| commit | ac90aa02d5b9a9bde6bcd9ac3ee181a4d212d355 (patch) | |
| tree | cee08de416ce02dde54846c6866d8da85a7ea1b1 /drivers/media/pci/saa7134/saa7134.h | |
| parent | 7047f2982a223e0ecca480c11a37bd9edf62b65a (diff) | |
| download | linux-ac90aa02d5b9a9bde6bcd9ac3ee181a4d212d355.tar.bz2 | |
[media] saa7134: add media controller support
Register saa7134 at the media controller core and provide
support for both analog TV and DVB.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/saa7134/saa7134.h')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h index e3e2392f87d6..8936568fab94 100644 --- a/drivers/media/pci/saa7134/saa7134.h +++ b/drivers/media/pci/saa7134/saa7134.h @@ -671,6 +671,19 @@ struct saa7134_dev { /* I2C keyboard data */ struct IR_i2c_init_data init_data; +#ifdef CONFIG_MEDIA_CONTROLLER + struct media_device *media_dev; + + struct media_entity input_ent[SAA7134_INPUT_MAX + 1]; + struct media_pad input_pad[SAA7134_INPUT_MAX + 1]; + + struct media_entity demod; + struct media_pad demod_pad[DEMOD_NUM_PADS]; + + struct media_pad video_pad, vbi_pad; + struct media_entity *decoder; +#endif + #if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB) /* SAA7134_MPEG_DVB only */ struct vb2_dvb_frontends frontends; |