summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/Documentation/video4linux/CARDLIST.tuner4
-rw-r--r--linux/drivers/media/dvb/frontends/dvb-pll.c15
-rw-r--r--linux/drivers/media/dvb/frontends/dvb-pll.h2
-rw-r--r--linux/drivers/media/video/cx88/cx88-cards.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88-dvb.c4
-rw-r--r--linux/drivers/media/video/tuner-simple.c13
-rw-r--r--linux/include/media/tuner.h4
-rw-r--r--v4l/ChangeLog17
8 files changed, 41 insertions, 22 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.tuner b/linux/Documentation/video4linux/CARDLIST.tuner
index 1d658a388..0bf3d5bf9 100644
--- a/linux/Documentation/video4linux/CARDLIST.tuner
+++ b/linux/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/linux/drivers/media/dvb/frontends/dvb-pll.c b/linux/drivers/media/dvb/frontends/dvb-pll.c
index f857b8696..a3d57ce9d 100644
--- a/linux/drivers/media/dvb/frontends/dvb-pll.c
+++ b/linux/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/linux/drivers/media/dvb/frontends/dvb-pll.h b/linux/drivers/media/dvb/frontends/dvb-pll.h
index 497d31dcf..24d4d2e9a 100644
--- a/linux/drivers/media/dvb/frontends/dvb-pll.h
+++ b/linux/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/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index c251ffbfe..c38a08675 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-cards.c,v 1.113 2005/12/05 02:31:46 mchehab Exp $
+ * $Id: cx88-cards.c,v 1.114 2005/12/20 07:32:45 mkrufky Exp $
*
* device driver for Conexant 2388x based TV cards
* card-specific stuff.
@@ -710,7 +710,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/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index 62d6f29d7..4ba6af604 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-dvb.c,v 1.76 2005/12/02 22:08:07 mkrufky Exp $
+ * $Id: cx88-dvb.c,v 1.77 2005/12/20 07:32:45 mkrufky Exp $
*
* device driver for Conexant 2388x based TV cards
* MPEG Transport Stream (DVB) routines
@@ -443,7 +443,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/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c
index d7ca1bc5b..d11bb31cc 100644
--- a/linux/drivers/media/video/tuner-simple.c
+++ b/linux/drivers/media/video/tuner-simple.c
@@ -1,5 +1,5 @@
/*
- * $Id: tuner-simple.c,v 1.65 2005/12/11 17:55:45 mchehab Exp $
+ * $Id: tuner-simple.c,v 1.66 2005/12/20 07:32:45 mkrufky Exp $
*
* i2c tv tuner chip device driver
* controls all those simple 4-control-bytes style tuners.
@@ -579,7 +579,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,
@@ -646,10 +646,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/linux/include/media/tuner.h b/linux/include/media/tuner.h
index 23d1b1fb1..ba79d49fd 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -1,5 +1,5 @@
/*
- $Id: tuner.h,v 1.66 2005/12/11 17:55:45 mchehab Exp $
+ $Id: tuner.h,v 1.67 2005/12/20 07:32:46 mkrufky Exp $
tuner.h - definition for different tuners
Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de)
@@ -103,7 +103,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 /* DViCO FusionHDTV 3 Gold-T */
#define TUNER_TENA_9533_DI 61
#define TUNER_TEA5767 62 /* Only FM Radio Tuner */
#define TUNER_PHILIPS_FMD1216ME_MK3 63
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 7e8b2bbe6..9f5e8fac6 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,20 @@
+2005-12-20 07:25 mkrufky
+
+ * linux/Documentation/video4linux/CARDLIST.tuner:
+ * linux/drivers/media/dvb/frontends/dvb-pll.c:
+ * linux/drivers/media/dvb/frontends/dvb-pll.h:
+ * linux/drivers/media/video/cx88/cx88-cards.c:
+ * linux/drivers/media/video/cx88/cx88-dvb.c: (dvb_register):
+ * linux/drivers/media/video/tuner-simple.c:
+ * linux/include/media/tuner.h:
+ - 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>
+
2005-12-19 15:52 hverkuil
* linux/drivers/media/common/saa7146_hlp.c: (saa7146_set_position):
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 04:43:09 +0000