diff options
author | Mauro Carvalho Chehab <devnull@localhost> | 2005-11-25 10:50:14 +0000 |
---|---|---|
committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-11-25 10:50:14 +0000 |
commit | 531d09900520fd3658e4ff498bc53e64019c0d7c (patch) | |
tree | a4ff380abfd10d35d7f62f51f4782365e84e2001 /linux/drivers | |
parent | e84aac377e19262b37a6f2204b28d3aab86eafc5 (diff) | |
download | mediapointer-dvb-s2-531d09900520fd3658e4ff498bc53e64019c0d7c.tar.gz mediapointer-dvb-s2-531d09900520fd3658e4ff498bc53e64019c0d7c.tar.bz2 |
added basic support (tv + radio) for TerraTec Cinergy 250 PCI
From: Jörg Schummer <joerg.schummer@web.de>
- Added "TerraTec Cinergy 250 PCI" board (tv and radio).
- svideo not tested
- IR yet not working
Signed-off-by: Jörg Schummer <joerg.schummer@web.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers')
-rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 36 | ||||
-rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 3 |
2 files changed, 37 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index e98acff11..e3a3effb1 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.115 2005/11/10 02:29:25 rmcc Exp $ + * $Id: saa7134-cards.c,v 1.116 2005/11/25 10:50:14 mchehab Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -2557,6 +2557,34 @@ struct saa7134_board saa7134_boards[] = { .amux = LINE1, }, }, + [SAA7134_BOARD_CINERGY250PCI] = { + /* remote-control does not work. The signal about a + key press comes in via gpio, but the key code + doesn't. Neither does it have an i2c remote control + interface. */ + .name = "Terratec Cinergy 250 PCI TV", + .audio_clock = 0x00187de7, + .tuner_type = TUNER_PHILIPS_TDA8290, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .gpiomask = 0x80200000, + .inputs = {{ + .name = name_tv, + .vmux = 1, + .amux = TV, + .tv = 1, + },{ + .name = name_svideo, /* NOT tested */ + .vmux = 8, + .amux = LINE1, + }}, + .radio = { + .name = name_radio, + .amux = LINE1, + .gpio = 0x0200000, + }, + }, }; const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); @@ -3004,6 +3032,12 @@ struct pci_device_id saa7134_pci_tbl[] = { .subdevice = 0x6231, .driver_data = SAA7134_BOARD_MSI_TVATANYWHERE_PLUS, },{ + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x153b, + .subdevice = 0x1160, + .driver_data = SAA7134_BOARD_CINERGY250PCI, + },{ /* --- 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 961e63145..ac9025697 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.82 2005/11/16 03:34:21 rmcc Exp $ + * $Id: saa7134.h,v 1.83 2005/11/25 10:50:14 mchehab Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -216,6 +216,7 @@ struct saa7134_format { #define SAA7134_BOARD_ASUSTEK_DIGIMATRIX_TV 80 #define SAA7134_BOARD_PHILIPS_TIGER 81 #define SAA7134_BOARD_MSI_TVATANYWHERE_PLUS 82 +#define SAA7134_BOARD_CINERGY250PCI 83 #define SAA7134_MAXBOARDS 8 #define SAA7134_INPUT_MAX 8 |