diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2006-03-11 15:02:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:53:10 -0500 |
commit | f3629be8388a679590eb919919ee63e2715ec25e (patch) | |
tree | d97efc61c0845959da4918041fec21c88b9df76a | |
parent | fd2f26771b14a321f4003366fdf99a2484fa6b2a (diff) |
V4L/DVB (3445): LG TALN series: add PAL / SECAM support
- added tuner_lg_taln_pal_secam_ranges
- renamed tuner 66 from TUNER_LG_NTSC_TALN_MINI to TUNER_LG_TALN
- updated FlyTV mini Asus Digimatrix with new tuner
Thanks-to: Rickard Osser <ricky@osser.se>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | Documentation/video4linux/CARDLIST.tuner | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 2 | ||||
-rw-r--r-- | drivers/media/video/tuner-types.c | 26 | ||||
-rw-r--r-- | include/media/tuner.h | 2 |
4 files changed, 21 insertions, 11 deletions
diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner index 44069338b531..1bcdac67dd8c 100644 --- a/Documentation/video4linux/CARDLIST.tuner +++ b/Documentation/video4linux/CARDLIST.tuner | |||
@@ -64,7 +64,7 @@ tuner=62 - Philips TEA5767HN FM Radio | |||
64 | tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner | 64 | tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner |
65 | tuner=64 - LG TDVS-H062F/TUA6034 | 65 | tuner=64 - LG TDVS-H062F/TUA6034 |
66 | tuner=65 - Ymec TVF66T5-B/DFF | 66 | tuner=65 - Ymec TVF66T5-B/DFF |
67 | tuner=66 - LG NTSC (TALN mini series) | 67 | tuner=66 - LG TALN series |
68 | tuner=67 - Philips TD1316 Hybrid Tuner | 68 | tuner=67 - Philips TD1316 Hybrid Tuner |
69 | tuner=68 - Philips TUV1236D ATSC/NTSC dual in | 69 | tuner=68 - Philips TUV1236D ATSC/NTSC dual in |
70 | tuner=69 - Tena TNF 5335 and similar models | 70 | tuner=69 - Tena TNF 5335 and similar models |
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index e9172e114974..f9265419ccb9 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -2028,7 +2028,7 @@ struct saa7134_board saa7134_boards[] = { | |||
2028 | [SAA7134_BOARD_FLYTV_DIGIMATRIX] = { | 2028 | [SAA7134_BOARD_FLYTV_DIGIMATRIX] = { |
2029 | .name = "FlyTV mini Asus Digimatrix", | 2029 | .name = "FlyTV mini Asus Digimatrix", |
2030 | .audio_clock = 0x00200000, | 2030 | .audio_clock = 0x00200000, |
2031 | .tuner_type = TUNER_LG_NTSC_TALN_MINI, | 2031 | .tuner_type = TUNER_LG_TALN, |
2032 | .radio_type = UNSET, | 2032 | .radio_type = UNSET, |
2033 | .tuner_addr = ADDR_UNSET, | 2033 | .tuner_addr = ADDR_UNSET, |
2034 | .radio_addr = ADDR_UNSET, | 2034 | .radio_addr = ADDR_UNSET, |
diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c index ae6a2cf91c9b..72e0f01db563 100644 --- a/drivers/media/video/tuner-types.c +++ b/drivers/media/video/tuner-types.c | |||
@@ -903,17 +903,27 @@ static struct tuner_params tuner_ymec_tvf66t5_b_dff_params[] = { | |||
903 | 903 | ||
904 | /* ------------ TUNER_LG_NTSC_TALN_MINI - LGINNOTEK NTSC ------------ */ | 904 | /* ------------ TUNER_LG_NTSC_TALN_MINI - LGINNOTEK NTSC ------------ */ |
905 | 905 | ||
906 | static struct tuner_range tuner_lg_taln_mini_ntsc_ranges[] = { | 906 | static struct tuner_range tuner_lg_taln_ntsc_ranges[] = { |
907 | { 16 * 137.25 /*MHz*/, 0x8e, 0x01, }, | 907 | { 16 * 137.25 /*MHz*/, 0x8e, 0x01, }, |
908 | { 16 * 373.25 /*MHz*/, 0x8e, 0x02, }, | 908 | { 16 * 373.25 /*MHz*/, 0x8e, 0x02, }, |
909 | { 16 * 999.99 , 0x8e, 0x08, }, | 909 | { 16 * 999.99 , 0x8e, 0x08, }, |
910 | }; | 910 | }; |
911 | 911 | ||
912 | static struct tuner_params tuner_lg_taln_mini_params[] = { | 912 | static struct tuner_range tuner_lg_taln_pal_secam_ranges[] = { |
913 | { 16 * 150.00 /*MHz*/, 0x8e, 0x01, }, | ||
914 | { 16 * 425.00 /*MHz*/, 0x8e, 0x02, }, | ||
915 | { 16 * 999.99 , 0x8e, 0x08, }, | ||
916 | }; | ||
917 | |||
918 | static struct tuner_params tuner_lg_taln_params[] = { | ||
913 | { | 919 | { |
914 | .type = TUNER_PARAM_TYPE_NTSC, | 920 | .type = TUNER_PARAM_TYPE_NTSC, |
915 | .ranges = tuner_lg_taln_mini_ntsc_ranges, | 921 | .ranges = tuner_lg_taln_ntsc_ranges, |
916 | .count = ARRAY_SIZE(tuner_lg_taln_mini_ntsc_ranges), | 922 | .count = ARRAY_SIZE(tuner_lg_taln_ntsc_ranges), |
923 | },{ | ||
924 | .type = TUNER_PARAM_TYPE_PAL, | ||
925 | .ranges = tuner_lg_taln_pal_secam_ranges, | ||
926 | .count = ARRAY_SIZE(tuner_lg_taln_pal_secam_ranges), | ||
917 | }, | 927 | }, |
918 | }; | 928 | }; |
919 | 929 | ||
@@ -1354,10 +1364,10 @@ struct tunertype tuners[] = { | |||
1354 | .params = tuner_ymec_tvf66t5_b_dff_params, | 1364 | .params = tuner_ymec_tvf66t5_b_dff_params, |
1355 | .count = ARRAY_SIZE(tuner_ymec_tvf66t5_b_dff_params), | 1365 | .count = ARRAY_SIZE(tuner_ymec_tvf66t5_b_dff_params), |
1356 | }, | 1366 | }, |
1357 | [TUNER_LG_NTSC_TALN_MINI] = { /* LGINNOTEK NTSC */ | 1367 | [TUNER_LG_TALN] = { /* LGINNOTEK NTSC / PAL / SECAM */ |
1358 | .name = "LG NTSC (TALN mini series)", | 1368 | .name = "LG TALN series", |
1359 | .params = tuner_lg_taln_mini_params, | 1369 | .params = tuner_lg_taln_params, |
1360 | .count = ARRAY_SIZE(tuner_lg_taln_mini_params), | 1370 | .count = ARRAY_SIZE(tuner_lg_taln_params), |
1361 | }, | 1371 | }, |
1362 | [TUNER_PHILIPS_TD1316] = { /* Philips PAL */ | 1372 | [TUNER_PHILIPS_TD1316] = { /* Philips PAL */ |
1363 | .name = "Philips TD1316 Hybrid Tuner", | 1373 | .name = "Philips TD1316 Hybrid Tuner", |
diff --git a/include/media/tuner.h b/include/media/tuner.h index 02d7d9a76fa2..017fed7d5e4d 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h | |||
@@ -110,7 +110,7 @@ | |||
110 | 110 | ||
111 | #define TUNER_LG_TDVS_H062F 64 /* DViCO FusionHDTV 5 */ | 111 | #define TUNER_LG_TDVS_H062F 64 /* DViCO FusionHDTV 5 */ |
112 | #define TUNER_YMEC_TVF66T5_B_DFF 65 /* Acorp Y878F */ | 112 | #define TUNER_YMEC_TVF66T5_B_DFF 65 /* Acorp Y878F */ |
113 | #define TUNER_LG_NTSC_TALN_MINI 66 | 113 | #define TUNER_LG_TALN 66 |
114 | #define TUNER_PHILIPS_TD1316 67 | 114 | #define TUNER_PHILIPS_TD1316 67 |
115 | 115 | ||
116 | #define TUNER_PHILIPS_TUV1236D 68 /* ATI HDTV Wonder */ | 116 | #define TUNER_PHILIPS_TUV1236D 68 /* ATI HDTV Wonder */ |