Skip to content

L
linux-davinci-2.6.23
Commit 550a9a5e authored by Hartmut Hackmann's avatar Hartmut Hackmann Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (4835): Added support for the Terratec Cinergy HT PCMCIA module 

This is a hybrid cardbus module. Besides the card support, i 
modified the definition names for AGC and GPIO of the tda10046.
Signed-off-by: default avatarHartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent ab33668f
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 14 deletions
Documentation/video4linux/CARDLIST.saa7134
View file @ 550a9a5e
...@@ -103,3 +103,4 @@ ...@@ -103,3 +103,4 @@
102 -> Avermedia AVerTV Studio 507 [1461:9715] 102 -> Avermedia AVerTV Studio 507 [1461:9715]
103 -> Compro Videomate DVB-T200A 103 -> Compro Videomate DVB-T200A
104 -> Hauppauge WinTV-HVR1110 DVB-T/Hybrid [0070:6701] 104 -> Hauppauge WinTV-HVR1110 DVB-T/Hybrid [0070:6701]
105 -> Terratec Cinergy HT PCMCIA [153b:1172]
drivers/media/dvb/frontends/tda1004x.c
View file @ 550a9a5e
...@@ -648,18 +648,24 @@ static int tda10046_init(struct dvb_frontend* fe) ...@@ -648,18 +648,24 @@ static int tda10046_init(struct dvb_frontend* fe)
tda1004x_write_byteI(state, TDA10046H_AGC_CONF, 0x0a); // AGC setup tda1004x_write_byteI(state, TDA10046H_AGC_CONF, 0x0a); // AGC setup
tda1004x_write_byteI(state, TDA10046H_CONF_POLARITY, 0x00); // set AGC polarities tda1004x_write_byteI(state, TDA10046H_CONF_POLARITY, 0x00); // set AGC polarities
break; break;
case TDA10046_AGC_TDA827X: case TDA10046_AGC_TDA827X_GP11:
tda1004x_write_byteI(state, TDA10046H_AGC_CONF, 0x02); // AGC setup tda1004x_write_byteI(state, TDA10046H_AGC_CONF, 0x02); // AGC setup
tda1004x_write_byteI(state, TDA10046H_AGC_THR, 0x70); // AGC Threshold tda1004x_write_byteI(state, TDA10046H_AGC_THR, 0x70); // AGC Threshold
tda1004x_write_byteI(state, TDA10046H_AGC_RENORM, 0x08); // Gain Renormalize tda1004x_write_byteI(state, TDA10046H_AGC_RENORM, 0x08); // Gain Renormalize
tda1004x_write_byteI(state, TDA10046H_CONF_POLARITY, 0x6a); // set AGC polarities tda1004x_write_byteI(state, TDA10046H_CONF_POLARITY, 0x6a); // set AGC polarities
break; break;
case TDA10046_AGC_TDA827X_GPL: case TDA10046_AGC_TDA827X_GP00:
tda1004x_write_byteI(state, TDA10046H_AGC_CONF, 0x02); // AGC setup tda1004x_write_byteI(state, TDA10046H_AGC_CONF, 0x02); // AGC setup
tda1004x_write_byteI(state, TDA10046H_AGC_THR, 0x70); // AGC Threshold tda1004x_write_byteI(state, TDA10046H_AGC_THR, 0x70); // AGC Threshold
tda1004x_write_byteI(state, TDA10046H_AGC_RENORM, 0x08); // Gain Renormalize tda1004x_write_byteI(state, TDA10046H_AGC_RENORM, 0x08); // Gain Renormalize
tda1004x_write_byteI(state, TDA10046H_CONF_POLARITY, 0x60); // set AGC polarities tda1004x_write_byteI(state, TDA10046H_CONF_POLARITY, 0x60); // set AGC polarities
break; break;
case TDA10046_AGC_TDA827X_GP01:
tda1004x_write_byteI(state, TDA10046H_AGC_CONF, 0x02); // AGC setup
tda1004x_write_byteI(state, TDA10046H_AGC_THR, 0x70); // AGC Threshold
tda1004x_write_byteI(state, TDA10046H_AGC_RENORM, 0x08); // Gain Renormalize
tda1004x_write_byteI(state, TDA10046H_CONF_POLARITY, 0x62); // set AGC polarities
break;
} }
tda1004x_write_byteI(state, TDA1004X_CONFADC2, 0x38); tda1004x_write_byteI(state, TDA1004X_CONFADC2, 0x38);
tda1004x_write_byteI(state, TDA10046H_CONF_TRISTATE1, 0x61); // Turn both AGC outputs on tda1004x_write_byteI(state, TDA10046H_CONF_TRISTATE1, 0x61); // Turn both AGC outputs on
......
drivers/media/dvb/frontends/tda1004x.h
View file @ 550a9a5e
...@@ -35,8 +35,9 @@ enum tda10046_agc { ...@@ -35,8 +35,9 @@ enum tda10046_agc {
TDA10046_AGC_DEFAULT, /* original configuration */ TDA10046_AGC_DEFAULT, /* original configuration */
TDA10046_AGC_IFO_AUTO_NEG, /* IF AGC only, automatic, negtive */ TDA10046_AGC_IFO_AUTO_NEG, /* IF AGC only, automatic, negtive */
TDA10046_AGC_IFO_AUTO_POS, /* IF AGC only, automatic, positive */ TDA10046_AGC_IFO_AUTO_POS, /* IF AGC only, automatic, positive */
TDA10046_AGC_TDA827X, /* IF AGC only, special setup for tda827x */ TDA10046_AGC_TDA827X_GP11, /* IF AGC only, special setup for tda827x */
TDA10046_AGC_TDA827X_GPL, /* same as above, but GPIOs 0 */ TDA10046_AGC_TDA827X_GP00, /* same as above, but GPIOs 0 */
TDA10046_AGC_TDA827X_GP01, /* same as above, but GPIO3=0 GPIO1=1*/
}; };
enum tda10046_if { enum tda10046_if {
......
drivers/media/video/saa7134/saa7134-cards.c
View file @ 550a9a5e
...@@ -3148,6 +3148,29 @@ struct saa7134_board saa7134_boards[] = { ...@@ -3148,6 +3148,29 @@ struct saa7134_board saa7134_boards[] = {
.gpio = 0x0200000, .gpio = 0x0200000,
}, },
}, },
[SAA7134_BOARD_CINERGY_HT_PCMCIA] = {
.name = "Terratec Cinergy HT PCMCIA",
.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);
...@@ -3780,6 +3803,12 @@ struct pci_device_id saa7134_pci_tbl[] = { ...@@ -3780,6 +3803,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
.subvendor = 0x0070, .subvendor = 0x0070,
.subdevice = 0x6701, .subdevice = 0x6701,
.driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1110, .driver_data = SAA7134_BOARD_HAUPPAUGE_HVR1110,
},{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7133,
.subvendor = 0x153b,
.subdevice = 0x1172,
.driver_data = SAA7134_BOARD_CINERGY_HT_PCMCIA,
},{ },{
/* --- boards without eeprom + subsystem ID --- */ /* --- boards without eeprom + subsystem ID --- */
.vendor = PCI_VENDOR_ID_PHILIPS, .vendor = PCI_VENDOR_ID_PHILIPS,
...@@ -4107,6 +4136,14 @@ int saa7134_board_init2(struct saa7134_dev *dev) ...@@ -4107,6 +4136,14 @@ int saa7134_board_init2(struct saa7134_dev *dev)
i2c_transfer(&dev->i2c_adap, &msg, 1); i2c_transfer(&dev->i2c_adap, &msg, 1);
} }
break; break;
case SAA7134_BOARD_CINERGY_HT_PCMCIA:
/* make the tda10046 find its eeprom */
{
u8 data[] = { 0x3c, 0x33, 0x60};
struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)};
i2c_transfer(&dev->i2c_adap, &msg, 1);
}
break;
case SAA7134_BOARD_KWORLD_ATSC110: case SAA7134_BOARD_KWORLD_ATSC110:
{ {
/* enable tuner */ /* enable tuner */
......
drivers/media/video/saa7134/saa7134-dvb.c
View file @ 550a9a5e
...@@ -677,7 +677,7 @@ static struct tda1004x_config tda827x_lifeview_config = { ...@@ -677,7 +677,7 @@ static struct tda1004x_config tda827x_lifeview_config = {
.invert = 1, .invert = 1,
.invert_oclk = 0, .invert_oclk = 0,
.xtal_freq = TDA10046_XTAL_16M, .xtal_freq = TDA10046_XTAL_16M,
.agc_config = TDA10046_AGC_TDA827X, .agc_config = TDA10046_AGC_TDA827X_GP11,
.if_freq = TDA10046_FREQ_045, .if_freq = TDA10046_FREQ_045,
.request_firmware = NULL, .request_firmware = NULL,
}; };
...@@ -881,7 +881,40 @@ static struct tda1004x_config philips_tiger_config = { ...@@ -881,7 +881,40 @@ static struct tda1004x_config philips_tiger_config = {
.invert = 1, .invert = 1,
.invert_oclk = 0, .invert_oclk = 0,
.xtal_freq = TDA10046_XTAL_16M, .xtal_freq = TDA10046_XTAL_16M,
.agc_config = TDA10046_AGC_TDA827X, .agc_config = TDA10046_AGC_TDA827X_GP11,
.if_freq = TDA10046_FREQ_045,
.request_firmware = NULL,
};
/* ------------------------------------------------------------------ */
static int cinergy_ht_tuner_init(struct dvb_frontend *fe)
{
struct saa7134_dev *dev = fe->dvb->priv;
static u8 data[] = { 0x3c, 0x33, 0x62};
struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)};
if (i2c_transfer(&dev->i2c_adap, &msg, 1) != 1)
return -EIO;
return 0;
}
static int cinergy_ht_tuner_sleep(struct dvb_frontend *fe)
{
struct saa7134_dev *dev = fe->dvb->priv;
static u8 data[] = { 0x3c, 0x33, 0x60};
struct i2c_msg msg = {.addr=0x08, .flags=0, .buf=data, .len = sizeof(data)};
i2c_transfer(&dev->i2c_adap, &msg, 1);
philips_tda827xa_tuner_sleep( 0x61, fe);
return 0;
}
static struct tda1004x_config cinergy_ht_config = {
.demod_address = 0x08,
.invert = 1,
.invert_oclk = 0,
.xtal_freq = TDA10046_XTAL_16M,
.agc_config = TDA10046_AGC_TDA827X_GP01,
.if_freq = TDA10046_FREQ_045, .if_freq = TDA10046_FREQ_045,
.request_firmware = NULL, .request_firmware = NULL,
}; };
...@@ -893,7 +926,7 @@ static struct tda1004x_config pinnacle_pctv_310i_config = { ...@@ -893,7 +926,7 @@ static struct tda1004x_config pinnacle_pctv_310i_config = {
.invert = 1, .invert = 1,
.invert_oclk = 0, .invert_oclk = 0,
.xtal_freq = TDA10046_XTAL_16M, .xtal_freq = TDA10046_XTAL_16M,
.agc_config = TDA10046_AGC_TDA827X, .agc_config = TDA10046_AGC_TDA827X_GP11,
.if_freq = TDA10046_FREQ_045, .if_freq = TDA10046_FREQ_045,
.request_firmware = philips_tda1004x_request_firmware, .request_firmware = philips_tda1004x_request_firmware,
}; };
...@@ -905,7 +938,7 @@ static struct tda1004x_config hauppauge_hvr_1110_config = { ...@@ -905,7 +938,7 @@ static struct tda1004x_config hauppauge_hvr_1110_config = {
.invert = 1, .invert = 1,
.invert_oclk = 0, .invert_oclk = 0,
.xtal_freq = TDA10046_XTAL_16M, .xtal_freq = TDA10046_XTAL_16M,
.agc_config = TDA10046_AGC_TDA827X, .agc_config = TDA10046_AGC_TDA827X_GP11,
.if_freq = TDA10046_FREQ_045, .if_freq = TDA10046_FREQ_045,
.request_firmware = philips_tda1004x_request_firmware, .request_firmware = philips_tda1004x_request_firmware,
}; };
...@@ -917,7 +950,7 @@ static struct tda1004x_config asus_p7131_dual_config = { ...@@ -917,7 +950,7 @@ static struct tda1004x_config asus_p7131_dual_config = {
.invert = 1, .invert = 1,
.invert_oclk = 0, .invert_oclk = 0,
.xtal_freq = TDA10046_XTAL_16M, .xtal_freq = TDA10046_XTAL_16M,
.agc_config = TDA10046_AGC_TDA827X, .agc_config = TDA10046_AGC_TDA827X_GP11,
.if_freq = TDA10046_FREQ_045, .if_freq = TDA10046_FREQ_045,
.request_firmware = philips_tda1004x_request_firmware, .request_firmware = philips_tda1004x_request_firmware,
}; };
...@@ -969,7 +1002,7 @@ static struct tda1004x_config lifeview_trio_config = { ...@@ -969,7 +1002,7 @@ static struct tda1004x_config lifeview_trio_config = {
.invert = 1, .invert = 1,
.invert_oclk = 0, .invert_oclk = 0,
.xtal_freq = TDA10046_XTAL_16M, .xtal_freq = TDA10046_XTAL_16M,
.agc_config = TDA10046_AGC_TDA827X_GPL, .agc_config = TDA10046_AGC_TDA827X_GP00,
.if_freq = TDA10046_FREQ_045, .if_freq = TDA10046_FREQ_045,
.request_firmware = NULL, .request_firmware = NULL,
}; };
...@@ -1006,7 +1039,7 @@ static struct tda1004x_config ads_tech_duo_config = { ...@@ -1006,7 +1039,7 @@ static struct tda1004x_config ads_tech_duo_config = {
.invert = 1, .invert = 1,
.invert_oclk = 0, .invert_oclk = 0,
.xtal_freq = TDA10046_XTAL_16M, .xtal_freq = TDA10046_XTAL_16M,
.agc_config = TDA10046_AGC_TDA827X_GPL, .agc_config = TDA10046_AGC_TDA827X_GP00,
.if_freq = TDA10046_FREQ_045, .if_freq = TDA10046_FREQ_045,
.request_firmware = NULL, .request_firmware = NULL,
}; };
...@@ -1031,7 +1064,7 @@ static struct tda1004x_config tevion_dvbt220rf_config = { ...@@ -1031,7 +1064,7 @@ static struct tda1004x_config tevion_dvbt220rf_config = {
.invert = 1, .invert = 1,
.invert_oclk = 0, .invert_oclk = 0,
.xtal_freq = TDA10046_XTAL_16M, .xtal_freq = TDA10046_XTAL_16M,
.agc_config = TDA10046_AGC_TDA827X, .agc_config = TDA10046_AGC_TDA827X_GP11,
.if_freq = TDA10046_FREQ_045, .if_freq = TDA10046_FREQ_045,
.request_firmware = NULL, .request_firmware = NULL,
}; };
...@@ -1076,7 +1109,7 @@ static struct tda1004x_config md8800_dvbt_config = { ...@@ -1076,7 +1109,7 @@ static struct tda1004x_config md8800_dvbt_config = {
.invert = 1, .invert = 1,
.invert_oclk = 0, .invert_oclk = 0,
.xtal_freq = TDA10046_XTAL_16M, .xtal_freq = TDA10046_XTAL_16M,
.agc_config = TDA10046_AGC_TDA827X, .agc_config = TDA10046_AGC_TDA827X_GP11,
.if_freq = TDA10046_FREQ_045, .if_freq = TDA10046_FREQ_045,
.request_firmware = NULL, .request_firmware = NULL,
}; };
...@@ -1362,6 +1395,18 @@ static int dvb_init(struct saa7134_dev *dev) ...@@ -1362,6 +1395,18 @@ static int dvb_init(struct saa7134_dev *dev)
dev->dvb.frontend->ops.tuner_ops.set_params = philips_td1316_tuner_set_params; dev->dvb.frontend->ops.tuner_ops.set_params = philips_td1316_tuner_set_params;
} }
break; break;
case SAA7134_BOARD_CINERGY_HT_PCMCIA:
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 = philips_tiger_tuner_set_params;
}
break;
default: default:
printk("%s: Huh? unknown DVB card?\n",dev->name); printk("%s: Huh? unknown DVB card?\n",dev->name);
break; break;
......
drivers/media/video/saa7134/saa7134.h
View file @ 550a9a5e
...@@ -230,7 +230,8 @@ struct saa7134_format { ...@@ -230,7 +230,8 @@ struct saa7134_format {
#define SAA7134_BOARD_PINNACLE_PCTV_310i 101 #define SAA7134_BOARD_PINNACLE_PCTV_310i 101
#define SAA7134_BOARD_AVERMEDIA_STUDIO_507 102 #define SAA7134_BOARD_AVERMEDIA_STUDIO_507 102
#define SAA7134_BOARD_VIDEOMATE_DVBT_200A 103 #define SAA7134_BOARD_VIDEOMATE_DVBT_200A 103
#define SAA7134_BOARD_HAUPPAUGE_HVR1110 104 #define SAA7134_BOARD_HAUPPAUGE_HVR1110 104
#define SAA7134_BOARD_CINERGY_HT_PCMCIA 105
#define SAA7134_MAXBOARDS 8 #define SAA7134_MAXBOARDS 8
#define SAA7134_INPUT_MAX 8 #define SAA7134_INPUT_MAX 8
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment