openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (5111): Saa7134: add support for Terratec Cinergy HT PCI 

Add support for Terratec Cinergy HT PCI

Signed-off-by: Giorgio Moscardi <software@sukkology.net>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Michael Krufky 2007-01-16 18:36:40 -03:00 committed by Mauro Carvalho Chehab
parent a4b662f736
commit 9de271e66d
4 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/video4linux/CARDLIST.saa7134
View File

@ -106,3 +106,4 @@
105 -> Terratec Cinergy HT PCMCIA [153b:1172] 105 -> Terratec Cinergy HT PCMCIA [153b:1172]
106 -> Encore ENLTV [1131:2342,1131:2341,3016:2344] 106 -> Encore ENLTV [1131:2342,1131:2341,3016:2344]
107 -> Encore ENLTV-FM [1131:230f] 107 -> Encore ENLTV-FM [1131:230f]
108 -> Terratec Cinergy HT PCI [153b:1175]

30
drivers/media/video/saa7134/saa7134-cards.c
View File

@ -3266,6 +3266,29 @@ struct saa7134_board saa7134_boards[] = {
.amux = 0, .amux = 0,
}, },
}, },
[SAA7134_BOARD_CINERGY_HT_PCI] = {
.name = "Terratec Cinergy HT PCI",
.audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_TDA8290,
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.mpeg = SAA7134_MPEG_DVB,
.inputs = {{
.name = name_tv,
.vmux = 1,
.amux = TV,
.tv = 1,
},{
.name = name_comp1,
.vmux = 0,
.amux = LINE1,
},{
.name = name_svideo,
.vmux = 6,
.amux = LINE1,
}},
},
}; };
const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@ -3928,6 +3951,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
.subvendor = 0x1131, .subvendor = 0x1131,
.subdevice = 0x230f, .subdevice = 0x230f,
.driver_data = SAA7134_BOARD_ENCORE_ENLTV_FM, .driver_data = SAA7134_BOARD_ENCORE_ENLTV_FM,
},{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
.subvendor = 0x153b,
.subdevice = 0x1175,
.driver_data = SAA7134_BOARD_CINERGY_HT_PCI,
},{ },{
/* --- boards without eeprom + subsystem ID --- */ /* --- boards without eeprom + subsystem ID --- */
.vendor = PCI_VENDOR_ID_PHILIPS, .vendor = PCI_VENDOR_ID_PHILIPS,
@ -4260,6 +4289,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
} }
break; break;
case SAA7134_BOARD_CINERGY_HT_PCMCIA: case SAA7134_BOARD_CINERGY_HT_PCMCIA:
case SAA7134_BOARD_CINERGY_HT_PCI:
/* make the tda10046 find its eeprom */ /* make the tda10046 find its eeprom */
{ {
u8 data[] = { 0x3c, 0x33, 0x60}; u8 data[] = { 0x3c, 0x33, 0x60};

12
drivers/media/video/saa7134/saa7134-dvb.c
View File

@ -1424,6 +1424,18 @@ static int dvb_init(struct saa7134_dev *dev)
dev->dvb.frontend->ops.tuner_ops.sleep = cinergy_ht_tuner_sleep; dev->dvb.frontend->ops.tuner_ops.sleep = cinergy_ht_tuner_sleep;
dev->dvb.frontend->ops.tuner_ops.set_params = philips_tiger_tuner_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = philips_tiger_tuner_set_params;
}
break;
case SAA7134_BOARD_CINERGY_HT_PCI:
dev->dvb.frontend = dvb_attach(tda10046_attach,
&cinergy_ht_config,
&dev->i2c_adap);
if (dev->dvb.frontend) {
dev->dvb.frontend->ops.i2c_gate_ctrl = tda8290_i2c_gate_ctrl;
dev->dvb.frontend->ops.tuner_ops.init = cinergy_ht_tuner_init;
dev->dvb.frontend->ops.tuner_ops.sleep = cinergy_ht_tuner_sleep;
dev->dvb.frontend->ops.tuner_ops.set_params = md8800_dvbt_pll_set;
} }
break; break;
default: default:

1
drivers/media/video/saa7134/saa7134.h
View File

@ -234,6 +234,7 @@ struct saa7134_format {
#define SAA7134_BOARD_CINERGY_HT_PCMCIA 105 #define SAA7134_BOARD_CINERGY_HT_PCMCIA 105
#define SAA7134_BOARD_ENCORE_ENLTV 106 #define SAA7134_BOARD_ENCORE_ENLTV 106
#define SAA7134_BOARD_ENCORE_ENLTV_FM 107 #define SAA7134_BOARD_ENCORE_ENLTV_FM 107
#define SAA7134_BOARD_CINERGY_HT_PCI 108
#define SAA7134_MAXBOARDS 8 #define SAA7134_MAXBOARDS 8
#define SAA7134_INPUT_MAX 8 #define SAA7134_INPUT_MAX 8