V4L/DVB (3196): correct Thomson DTT 761x frequency ranges

- Corrected Thomson DTT 7611 tuner programming, based on spec sheet
- renamed to Thomson DTT 761x
- applies to DTT 7611 7611A 7612 7613 7613A 7614 7615 7615A
(DTT 7610 is similar, but slightly different programming)
- corrected frequency ranges for analog and digital modes

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner
index 1d658a388b80ece0f1808062ac697a9923222621..0bf3d5bf9ef8c2a837fee536e9da636c7dd4bc36 100644 (file)
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
@@ -50,7 +50,7 @@ tuner=48 - Tenna TNF 8831 BGFF)
 tuner=49 - Microtune 4042 FI5 ATSC/NTSC dual in
 tuner=50 - TCL 2002N
 tuner=51 - Philips PAL/SECAM_D (FM 1256 I-H3)
-tuner=52 - Thomson DDT 7610 (ATSC/NTSC)
+tuner=52 - Thomson DTT 7610 (ATSC/NTSC)
 tuner=53 - Philips FQ1286
 tuner=54 - tda8290+75
 tuner=55 - TCL 2002MB
@@ -58,7 +58,7 @@ tuner=56 - Philips PAL/SECAM multi (FQ1216AME MK4)
 tuner=57 - Philips FQ1236A MK4
 tuner=58 - Ymec TVision TVF-8531MF/8831MF/8731MF
 tuner=59 - Ymec TVision TVF-5533MF
-tuner=60 - Thomson DDT 7611 (ATSC/NTSC)
+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

diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index f857b869616c305cff9cf1b66135eaa303eb6841..a3d57ce9dd1230ded1a291ad590e39703dcf7c54 100644 (file)
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -107,18 +107,19 @@ struct dvb_pll_desc dvb_pll_microtune_4042 = {
 };
 EXPORT_SYMBOL(dvb_pll_microtune_4042);
 
-struct dvb_pll_desc dvb_pll_thomson_dtt7611 = {
-       .name  = "Thomson dtt7611",
-       .min   =  44000000,
-       .max   = 958000000,
+struct dvb_pll_desc dvb_pll_thomson_dtt761x = {
+       /* DTT 7611 7611A 7612 7613 7613A 7614 7615 7615A */
+       .name  = "Thomson dtt761x",
+       .min   =  57000000,
+       .max   = 863000000,
        .count = 3,
        .entries = {
-               { 157250000, 44000000, 62500, 0x8e, 0x39 },
-               { 454000000, 44000000, 62500, 0x8e, 0x3a },
+               { 147000000, 44000000, 62500, 0x8e, 0x39 },
+               { 417000000, 44000000, 62500, 0x8e, 0x3a },
                { 999999999, 44000000, 62500, 0x8e, 0x3c },
        },
 };
-EXPORT_SYMBOL(dvb_pll_thomson_dtt7611);
+EXPORT_SYMBOL(dvb_pll_thomson_dtt761x);
 
 struct dvb_pll_desc dvb_pll_unknown_1 = {
        .name  = "unknown 1", /* used by dntv live dvb-t */

diff --git a/drivers/media/dvb/frontends/dvb-pll.h b/drivers/media/dvb/frontends/dvb-pll.h
index 497d31dcf41ebd0e832004ce6194f02a4b913287..24d4d2e9acd8fdcc6361621454af2c43a110cb18 100644 (file)
--- a/drivers/media/dvb/frontends/dvb-pll.h
+++ b/drivers/media/dvb/frontends/dvb-pll.h
@@ -25,7 +25,7 @@ extern struct dvb_pll_desc dvb_pll_thomson_dtt759x;
 extern struct dvb_pll_desc dvb_pll_thomson_dtt7610;
 extern struct dvb_pll_desc dvb_pll_lg_z201;
 extern struct dvb_pll_desc dvb_pll_microtune_4042;
-extern struct dvb_pll_desc dvb_pll_thomson_dtt7611;
+extern struct dvb_pll_desc dvb_pll_thomson_dtt761x;
 extern struct dvb_pll_desc dvb_pll_unknown_1;
 
 extern struct dvb_pll_desc dvb_pll_tua6010xs;

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index c20c07117537c6f2fb35b927532a3861b44d01f6..85798e1fa0474c6b8fe3403801b081d0e7ab3f67 100644 (file)
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -708,7 +708,7 @@ struct cx88_board cx88_boards[] = {
        },
        [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T] = {
                .name           = "DViCO FusionHDTV 3 Gold-T",
-               .tuner_type     = TUNER_THOMSON_DTT7611,
+               .tuner_type     = TUNER_THOMSON_DTT761X,
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index c4551d996119434e6fa8b83960996a64ebf68a17..ed5cfe5f5c0e219be15945cff72cdc8a4caca58c 100644 (file)
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -441,7 +441,7 @@ static int dvb_register(struct cx8802_dev *dev)
                cx_set(MO_GP0_IO, 9);
                mdelay(200);
                dev->core->pll_addr = 0x61;
-               dev->core->pll_desc = &dvb_pll_thomson_dtt7611;
+               dev->core->pll_desc = &dvb_pll_thomson_dtt761x;
                dev->dvb.frontend = lgdt330x_attach(&fusionhdtv_3_gold,
                                                    &dev->core->i2c_adap);
                }

diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index cabb02a610dfe7281c4ebc84c72afb296380b66b..985464f4b7c2bd04670fe49ae378462fced9bd1d 100644 (file)
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -573,7 +573,7 @@ static struct tunertype tuners[] = {
                .config = 0x8e,
        },
        [TUNER_THOMSON_DTT7610] = { /* THOMSON ATSC */
-               .name   = "Thomson DDT 7610 (ATSC/NTSC)",
+               .name   = "Thomson DTT 7610 (ATSC/NTSC)",
                .thresh1= 16 * 157.25 /*MHz*/,
                .thresh2= 16 * 454.00 /*MHz*/,
                .VHF_L  = 0x39,
@@ -640,10 +640,11 @@ static struct tunertype tuners[] = {
        },
 
        /* 60-69 */
-       [TUNER_THOMSON_DTT7611] = { /* THOMSON ATSC */
-               .name   = "Thomson DDT 7611 (ATSC/NTSC)",
-               .thresh1= 16 * 157.25 /*MHz*/,
-               .thresh2= 16 * 454.00 /*MHz*/,
+       [TUNER_THOMSON_DTT761X] = { /* THOMSON ATSC */
+               /* DTT 7611 7611A 7612 7613 7613A 7614 7615 7615A */
+               .name   = "Thomson DTT 761X (ATSC/NTSC)",
+               .thresh1= 16 * 145.25 /*MHz*/,
+               .thresh2= 16 * 415.25 /*MHz*/,
                .VHF_L  = 0x39,
                .VHF_H  = 0x3a,
                .UHF    = 0x3c,

diff --git a/include/media/tuner.h b/include/media/tuner.h
index b39e908cd068187e123e905ccacac7983516f58a..aa91ce35915b769492790286140e23d02d06400b 100644 (file)
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -102,7 +102,7 @@
 #define TUNER_YMEC_TVF_8531MF          58
 #define TUNER_YMEC_TVF_5533MF          59      /* Pixelview Pro Ultra NTSC */
 
-#define TUNER_THOMSON_DTT7611          60      /* DViCO FusionHDTV 3 Gold-T */
+#define TUNER_THOMSON_DTT761X          60      /* DTT 7611 7611A 7612 7613 7613A 7614 7615 7615A */
 #define TUNER_TENA_9533_DI             61
 #define TUNER_TEA5767                  62      /* Only FM Radio Tuner */
 #define TUNER_PHILIPS_FMD1216ME_MK3    63