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>

5 files changed, 17 insertions, 15 deletions

diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index f857b869616c..a3d57ce9dd12 100644
--- 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 497d31dcf41e..24d4d2e9acd8 100644
--- 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 c20c07117537..85798e1fa047 100644
--- 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 c4551d996119..ed5cfe5f5c0e 100644
--- 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 cabb02a610df..985464f4b7c2 100644
--- 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,