V4L/DVB (3411): FE6600 is a Thomson tuner
- The tuner used in DViCO FusionHDTV DVB-T hybrid is made by Thomson - renamed tuner and dvb_pll structs accordingly Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Родитель
69b27e3dfe
Коммит
91ae3299d7
|
@ -70,4 +70,4 @@ tuner=68 - Philips TUV1236D ATSC/NTSC dual in
|
||||||
tuner=69 - Tena TNF 5335 MF
|
tuner=69 - Tena TNF 5335 MF
|
||||||
tuner=70 - Samsung TCPN 2121P30A
|
tuner=70 - Samsung TCPN 2121P30A
|
||||||
tuner=71 - Xceive xc3028
|
tuner=71 - Xceive xc3028
|
||||||
tuner=72 - FE6600
|
tuner=72 - Thomson FE6600
|
||||||
|
|
|
@ -405,8 +405,8 @@ struct dvb_pll_desc dvb_pll_philips_td1316 = {
|
||||||
EXPORT_SYMBOL(dvb_pll_philips_td1316);
|
EXPORT_SYMBOL(dvb_pll_philips_td1316);
|
||||||
|
|
||||||
/* FE6600 used on DViCO Hybrid */
|
/* FE6600 used on DViCO Hybrid */
|
||||||
struct dvb_pll_desc dvb_pll_unknown_fe6600 = {
|
struct dvb_pll_desc dvb_pll_thomson_fe6600 = {
|
||||||
.name = "FE6600",
|
.name = "Thomson FE6600",
|
||||||
.min = 44250000,
|
.min = 44250000,
|
||||||
.max = 858000000,
|
.max = 858000000,
|
||||||
.count = 4,
|
.count = 4,
|
||||||
|
@ -417,7 +417,7 @@ struct dvb_pll_desc dvb_pll_unknown_fe6600 = {
|
||||||
{ 999999999, 36213333, 166667, 0xf4, 0x18 },
|
{ 999999999, 36213333, 166667, 0xf4, 0x18 },
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
EXPORT_SYMBOL(dvb_pll_unknown_fe6600);
|
EXPORT_SYMBOL(dvb_pll_thomson_fe6600);
|
||||||
|
|
||||||
/* ----------------------------------------------------------- */
|
/* ----------------------------------------------------------- */
|
||||||
/* code */
|
/* code */
|
||||||
|
|
|
@ -42,7 +42,7 @@ extern struct dvb_pll_desc dvb_pll_samsung_tbmv;
|
||||||
extern struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261;
|
extern struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261;
|
||||||
extern struct dvb_pll_desc dvb_pll_philips_td1316;
|
extern struct dvb_pll_desc dvb_pll_philips_td1316;
|
||||||
|
|
||||||
extern struct dvb_pll_desc dvb_pll_unknown_fe6600;
|
extern struct dvb_pll_desc dvb_pll_thomson_fe6600;
|
||||||
|
|
||||||
int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
|
int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
|
||||||
u32 freq, int bandwidth);
|
u32 freq, int bandwidth);
|
||||||
|
|
|
@ -1073,7 +1073,7 @@ struct cx88_board cx88_boards[] = {
|
||||||
},
|
},
|
||||||
[CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = {
|
[CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID] = {
|
||||||
.name = "DViCO FusionHDTV DVB-T Hybrid",
|
.name = "DViCO FusionHDTV DVB-T Hybrid",
|
||||||
.tuner_type = TUNER_FE6600,
|
.tuner_type = TUNER_THOMSON_FE6600,
|
||||||
.radio_type = UNSET,
|
.radio_type = UNSET,
|
||||||
.tuner_addr = ADDR_UNSET,
|
.tuner_addr = ADDR_UNSET,
|
||||||
.radio_addr = ADDR_UNSET,
|
.radio_addr = ADDR_UNSET,
|
||||||
|
|
|
@ -599,7 +599,7 @@ static int dvb_register(struct cx8802_dev *dev)
|
||||||
#ifdef HAVE_ZL10353
|
#ifdef HAVE_ZL10353
|
||||||
case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
|
case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
|
||||||
dev->core->pll_addr = 0x61;
|
dev->core->pll_addr = 0x61;
|
||||||
dev->core->pll_desc = &dvb_pll_unknown_fe6600;
|
dev->core->pll_desc = &dvb_pll_thomson_fe6600;
|
||||||
dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_hybrid,
|
dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_hybrid,
|
||||||
&dev->core->i2c_adap);
|
&dev->core->i2c_adap);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -983,19 +983,19 @@ static struct tuner_params tuner_samsung_tcpn_2121p30a_params[] = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
/* ------------ TUNER_FE6600 - DViCO Hybrid PAL ------------ */
|
/* ------------ TUNER_THOMSON_FE6600 - DViCO Hybrid PAL ------------ */
|
||||||
|
|
||||||
static struct tuner_range tuner_fe6600_ranges[] = {
|
static struct tuner_range tuner_thomson_fe6600_ranges[] = {
|
||||||
{ 16 * 160.00 /*MHz*/, 0xfe, 0x11, },
|
{ 16 * 160.00 /*MHz*/, 0xfe, 0x11, },
|
||||||
{ 16 * 442.00 /*MHz*/, 0xf6, 0x12, },
|
{ 16 * 442.00 /*MHz*/, 0xf6, 0x12, },
|
||||||
{ 16 * 999.99 , 0xf6, 0x18, },
|
{ 16 * 999.99 , 0xf6, 0x18, },
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct tuner_params tuner_fe6600_params[] = {
|
static struct tuner_params tuner_thomson_fe6600_params[] = {
|
||||||
{
|
{
|
||||||
.type = TUNER_PARAM_TYPE_PAL,
|
.type = TUNER_PARAM_TYPE_PAL,
|
||||||
.ranges = tuner_fe6600_ranges,
|
.ranges = tuner_thomson_fe6600_ranges,
|
||||||
.count = ARRAY_SIZE(tuner_fe6600_ranges),
|
.count = ARRAY_SIZE(tuner_thomson_fe6600_ranges),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1370,9 +1370,9 @@ struct tunertype tuners[] = {
|
||||||
.name = "Xceive xc3028",
|
.name = "Xceive xc3028",
|
||||||
/* see xc3028.c for details */
|
/* see xc3028.c for details */
|
||||||
},
|
},
|
||||||
[TUNER_FE6600] = { /* */
|
[TUNER_THOMSON_FE6600] = { /* Thomson PAL / DVB-T */
|
||||||
.name = "FE6600",
|
.name = "Thomson FE6600",
|
||||||
.params = tuner_fe6600_params,
|
.params = tuner_thomson_fe6600_params,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -118,7 +118,7 @@
|
||||||
#define TUNER_SAMSUNG_TCPN_2121P30A 70 /* Hauppauge PVR-500MCE NTSC */
|
#define TUNER_SAMSUNG_TCPN_2121P30A 70 /* Hauppauge PVR-500MCE NTSC */
|
||||||
#define TUNER_XCEIVE_XC3028 71
|
#define TUNER_XCEIVE_XC3028 71
|
||||||
|
|
||||||
#define TUNER_FE6600 72 /* DViCO FusionHDTV DVB-T Hybrid */
|
#define TUNER_THOMSON_FE6600 72 /* DViCO FusionHDTV DVB-T Hybrid */
|
||||||
|
|
||||||
/* tv card specific */
|
/* tv card specific */
|
||||||
#define TDA9887_PRESENT (1<<0)
|
#define TDA9887_PRESENT (1<<0)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче