diff options
| author | Michael Krufky <devnull@localhost> | 2006-01-04 13:30:55 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2006-01-04 13:30:55 +0000 |
| commit | 07dad85131c9252794cd18dbf88b2273661fbc22 (patch) | |
| tree | 5c2c78c0919ecb2a88384697f2d41fb06ce9cf42 /linux/drivers/media/video | |
| parent | dc11fd9b880618b1ad528710c56bd7913971cdf0 (diff) | |
| download | mediapointer-dvb-s2-07dad85131c9252794cd18dbf88b2273661fbc22.tar.gz mediapointer-dvb-s2-07dad85131c9252794cd18dbf88b2273661fbc22.tar.bz2 | |
Add analog support for LifeView FlyDVB Trio.
From: Peter Missel <peter.missel@onlinehome.de>
- Add support for LifeView FlyDVB Trio.
- all analog inputs are supported and working, including FM radio
- TO DO: dvb & remote control
Signed-off-by: Peter Missel <peter.missel@onlinehome.de>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 46 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 3 |
2 files changed, 47 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 43627c163..53a7db73b 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-cards.c,v 1.120 2006/01/01 17:17:39 mchehab Exp $ + * $Id: saa7134-cards.c,v 1.121 2006/01/04 13:30:55 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -2586,6 +2586,44 @@ struct saa7134_board saa7134_boards[] = { .gpio = 0x0200000, }, }, + [SAA7134_BOARD_FLYDVB_TRIO] = { + /* LifeView LR319 FlyDVB Trio */ + /* Peter Missel <peter.missel@onlinehome.de> */ + .name = "LifeView FlyDVB Trio", + .audio_clock = 0x00200000, + .tuner_type = TUNER_PHILIPS_TDA8290, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .gpiomask = 0x00200000, +#if 0 + .mpeg = SAA7134_MPEG_DVB, /* FIXME: DVB not implemented yet */ +#endif + .inputs = {{ + .name = name_tv, /* Analog broadcast/cable TV */ + .vmux = 1, + .amux = TV, + .gpio = 0x200000, /* GPIO21=High for TV input */ + .tv = 1, + },{ + .name = name_svideo, /* S-Video signal on S-Video input */ + .vmux = 8, + .amux = LINE2, + },{ + .name = name_comp1, /* Composite signal on S-Video input */ + .vmux = 0, + .amux = LINE2, + },{ + .name = name_comp2, /* Composite input */ + .vmux = 3, + .amux = LINE2, + }}, + .radio = { + .name = name_radio, + .amux = TV, + .gpio = 0x000000, /* GPIO21=Low for FM radio antenna */ + }, + }, }; const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); @@ -3045,6 +3083,12 @@ struct pci_device_id saa7134_pci_tbl[] = { .subdevice = 0x1160, .driver_data = SAA7134_BOARD_CINERGY250PCI, },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA 7131E */ + .subvendor = 0x5168, + .subdevice = 0x0319, + .driver_data = SAA7134_BOARD_FLYDVB_TRIO, + },{ /* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134, diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index c95abe4f3..2e7f74e2c 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -1,5 +1,5 @@ /* - * $Id: saa7134.h,v 1.87 2006/01/01 17:17:39 mchehab Exp $ + * $Id: saa7134.h,v 1.88 2006/01/04 13:30:55 mkrufky Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -217,6 +217,7 @@ struct saa7134_format { #define SAA7134_BOARD_PHILIPS_TIGER 81 #define SAA7134_BOARD_MSI_TVATANYWHERE_PLUS 82 #define SAA7134_BOARD_CINERGY250PCI 83 +#define SAA7134_BOARD_FLYDVB_TRIO 84 #define SAA7134_MAXBOARDS 8 #define SAA7134_INPUT_MAX 8 |