aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@m1k.net>2005-06-24 01:04:56 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-24 03:06:38 -0400
commit3c1d0185db6a44b6304c404f4da1a1a98746ca46 (patch)
tree8837af3c12bd6ab030c83666255ace841461c02e
parent80d34362f391840dcb10c0ec261f765871a586f7 (diff)
[PATCH] v4l: support tuner for Thomson DDT 7611 (ATSC/NTSC)
Add support for tuner#60: Thomson DDT 7611 (ATSC/NTSC) Change tuner in card#28 (DViCO FusionHDTV3 Gold-T) from tuner=52 (Tuner Thomson DDT 7610) to tuner=60 (Tuner Thomson DDT 7611) Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/media/video/cx88/cx88-cards.c2
-rw-r--r--drivers/media/video/tuner-simple.c3
-rw-r--r--include/media/tuner.h2
3 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index c3a561e38e54..a6763f1a44c1 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -431,7 +431,7 @@ struct cx88_board cx88_boards[] = {
431 }, 431 },
432 [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T] = { 432 [CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T] = {
433 .name = "DViCO - FusionHDTV 3 Gold-T", 433 .name = "DViCO - FusionHDTV 3 Gold-T",
434 .tuner_type = 52, /* Thomson DDT 7611 ATSC/NTSC */ 434 .tuner_type = 60, /* Thomson DDT 7611 ATSC/NTSC */
435 /* See DViCO FusionHDTV 3 Gold for GPIO documentation. */ 435 /* See DViCO FusionHDTV 3 Gold for GPIO documentation. */
436 .input = {{ 436 .input = {{
437 .type = CX88_VMUX_TELEVISION, 437 .type = CX88_VMUX_TELEVISION,
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index f7305c8d53de..866f18dc5b58 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -217,6 +217,9 @@ static struct tunertype tuners[] = {
217 16*160.00,16*454.00,0xa0,0x90,0x30,0x8e,732}, 217 16*160.00,16*454.00,0xa0,0x90,0x30,0x8e,732},
218 { "Ymec TVision TVF-5533MF", Philips, NTSC, 218 { "Ymec TVision TVF-5533MF", Philips, NTSC,
219 16*160.00,16*454.00,0x01,0x02,0x04,0x8e,732}, 219 16*160.00,16*454.00,0x01,0x02,0x04,0x8e,732},
220
221 { "Thomson DDT 7611 (ATSC/NTSC)", THOMSON, ATSC,
222 16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732},
220}; 223};
221unsigned const int tuner_count = ARRAY_SIZE(tuners); 224unsigned const int tuner_count = ARRAY_SIZE(tuners);
222 225
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 6d29d8db0c83..cb75f4809c4d 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -101,6 +101,8 @@
101#define TUNER_YMEC_TVF_8531MF 58 101#define TUNER_YMEC_TVF_8531MF 58
102#define TUNER_YMEC_TVF_5533MF 59 /* Pixelview Pro Ultra NTSC */ 102#define TUNER_YMEC_TVF_5533MF 59 /* Pixelview Pro Ultra NTSC */
103 103
104#define TUNER_THOMSON_DTT7611 60
105
104#define NOTUNER 0 106#define NOTUNER 0
105#define PAL 1 /* PAL_BG */ 107#define PAL 1 /* PAL_BG */
106#define PAL_I 2 108#define PAL_I 2