aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c2
-rw-r--r--drivers/media/video/tuner-types.c26
2 files changed, 19 insertions, 9 deletions
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
906static struct tuner_range tuner_lg_taln_mini_ntsc_ranges[] = { 906static 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
912static struct tuner_params tuner_lg_taln_mini_params[] = { 912static 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
918static 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",