diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-04-22 15:20:08 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-04-22 15:20:08 -0400 |
| commit | 39f0f4d3c526e9c9adc5425931fda82bae55b84d (patch) | |
| tree | c7d0fd7b8aa97298e24315bf10100275e4af14d3 | |
| parent | cf6e70b22f9b36eddcafb91340729c1b87de3903 (diff) | |
| parent | a3443fe26243f9e8a2d5c4f74624990d9be848c5 (diff) | |
| download | mediapointer-dvb-s2-39f0f4d3c526e9c9adc5425931fda82bae55b84d.tar.gz mediapointer-dvb-s2-39f0f4d3c526e9c9adc5425931fda82bae55b84d.tar.bz2 | |
merge: from ~mkrufky/lg-h06xf-pll-fix
From: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.tuner | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/dvb-pll.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-types.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.tuner b/linux/Documentation/video4linux/CARDLIST.tuner index 46ae7775b..44134f04b 100644 --- a/linux/Documentation/video4linux/CARDLIST.tuner +++ b/linux/Documentation/video4linux/CARDLIST.tuner @@ -62,7 +62,7 @@ tuner=60 - Thomson DTT 761X (ATSC/NTSC) tuner=61 - Tena TNF9533-D/IF/TNF9533-B/DF tuner=62 - Philips TEA5767HN FM Radio tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner -tuner=64 - LG TDVS-H062F/TUA6034 +tuner=64 - LG TDVS-H06xF tuner=65 - Ymec TVF66T5-B/DFF tuner=66 - LG TALN series tuner=67 - Philips TD1316 Hybrid Tuner diff --git a/linux/drivers/media/dvb/frontends/dvb-pll.c b/linux/drivers/media/dvb/frontends/dvb-pll.c index b6e2c387a..50a79eea8 100644 --- a/linux/drivers/media/dvb/frontends/dvb-pll.c +++ b/linux/drivers/media/dvb/frontends/dvb-pll.c @@ -227,16 +227,16 @@ struct dvb_pll_desc dvb_pll_tua6034 = { EXPORT_SYMBOL(dvb_pll_tua6034); /* Infineon TUA6034 - * used in LG TDVS H061F and LG TDVS H062F + * used in LG TDVS-H061F, LG TDVS-H062F and LG TDVS-H064F */ struct dvb_pll_desc dvb_pll_tdvs_tua6034 = { - .name = "LG/Infineon TUA6034", + .name = "LG TDVS-H06xF", .min = 54000000, .max = 863000000, .count = 3, .entries = { - { 160000000, 44000000, 62500, 0xce, 0x01 }, - { 455000000, 44000000, 62500, 0xce, 0x02 }, + { 165000000, 44000000, 62500, 0xce, 0x01 }, + { 450000000, 44000000, 62500, 0xce, 0x02 }, { 999999999, 44000000, 62500, 0xce, 0x04 }, }, }; diff --git a/linux/drivers/media/video/tuner-types.c b/linux/drivers/media/video/tuner-types.c index 897270f56..f1d3a7556 100644 --- a/linux/drivers/media/video/tuner-types.c +++ b/linux/drivers/media/video/tuner-types.c @@ -903,8 +903,8 @@ static struct tuner_params tuner_philips_fmd1216me_mk3_params[] = { /* ------------ TUNER_LG_TDVS_H062F - INFINEON ATSC ------------ */ static struct tuner_range tuner_tua6034_ntsc_ranges[] = { - { 16 * 160.00 /*MHz*/, 0x8e, 0x01 }, - { 16 * 455.00 /*MHz*/, 0x8e, 0x02 }, + { 16 * 165.00 /*MHz*/, 0x8e, 0x01 }, + { 16 * 450.00 /*MHz*/, 0x8e, 0x02 }, { 16 * 999.99 , 0x8e, 0x04 }, }; @@ -1419,7 +1419,7 @@ struct tunertype tuners[] = { .count = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_params), }, [TUNER_LG_TDVS_H062F] = { /* LGINNOTEK ATSC */ - .name = "LG TDVS-H062F/TUA6034", + .name = "LG TDVS-H06xF", /* H061F, H062F & H064F */ .params = tuner_tua6034_params, .count = ARRAY_SIZE(tuner_tua6034_params), }, |