diff options
-rw-r--r-- | drivers/media/video/bt8xx/bttv-cards.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 4 | ||||
-rw-r--r-- | drivers/media/video/tuner-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/tuner-types.c | 10 | ||||
-rw-r--r-- | include/media/tuner.h | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index 1a56846c1dc1..e358e91143d7 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
@@ -2745,7 +2745,7 @@ struct tvcard bttv_tvcards[] = { | |||
2745 | /* Michael Krufky <mkrufky@m1k.net> */ | 2745 | /* Michael Krufky <mkrufky@m1k.net> */ |
2746 | .name = "DViCO FusionHDTV 5 Lite", | 2746 | .name = "DViCO FusionHDTV 5 Lite", |
2747 | .tuner = 0, | 2747 | .tuner = 0, |
2748 | .tuner_type = TUNER_LG_TDVS_H062F, | 2748 | .tuner_type = TUNER_LG_TDVS_H06XF, /* TDVS-H064F */ |
2749 | .tuner_addr = ADDR_UNSET, | 2749 | .tuner_addr = ADDR_UNSET, |
2750 | .radio_addr = ADDR_UNSET, | 2750 | .radio_addr = ADDR_UNSET, |
2751 | .video_inputs = 3, | 2751 | .video_inputs = 3, |
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index 9516c4081192..645464b2d269 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
@@ -759,7 +759,7 @@ struct cx88_board cx88_boards[] = { | |||
759 | }, | 759 | }, |
760 | [CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD] = { | 760 | [CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD] = { |
761 | .name = "DViCO FusionHDTV 5 Gold", | 761 | .name = "DViCO FusionHDTV 5 Gold", |
762 | .tuner_type = TUNER_LG_TDVS_H062F, | 762 | .tuner_type = TUNER_LG_TDVS_H06XF, /* TDVS-H062F */ |
763 | .radio_type = UNSET, | 763 | .radio_type = UNSET, |
764 | .tuner_addr = ADDR_UNSET, | 764 | .tuner_addr = ADDR_UNSET, |
765 | .radio_addr = ADDR_UNSET, | 765 | .radio_addr = ADDR_UNSET, |
@@ -1096,7 +1096,7 @@ struct cx88_board cx88_boards[] = { | |||
1096 | }, | 1096 | }, |
1097 | [CX88_BOARD_PCHDTV_HD5500] = { | 1097 | [CX88_BOARD_PCHDTV_HD5500] = { |
1098 | .name = "pcHDTV HD5500 HDTV", | 1098 | .name = "pcHDTV HD5500 HDTV", |
1099 | .tuner_type = TUNER_LG_TDVS_H062F, | 1099 | .tuner_type = TUNER_LG_TDVS_H06XF, /* TDVS-H064F */ |
1100 | .radio_type = UNSET, | 1100 | .radio_type = UNSET, |
1101 | .tuner_addr = ADDR_UNSET, | 1101 | .tuner_addr = ADDR_UNSET, |
1102 | .radio_addr = ADDR_UNSET, | 1102 | .radio_addr = ADDR_UNSET, |
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index 1013b4de89a2..cc4a38b34585 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c | |||
@@ -199,7 +199,7 @@ static void set_type(struct i2c_client *c, unsigned int type, | |||
199 | i2c_master_send(c, buffer, 4); | 199 | i2c_master_send(c, buffer, 4); |
200 | default_tuner_init(c); | 200 | default_tuner_init(c); |
201 | break; | 201 | break; |
202 | case TUNER_LG_TDVS_H062F: | 202 | case TUNER_LG_TDVS_H06XF: |
203 | /* Set the Auxiliary Byte. */ | 203 | /* Set the Auxiliary Byte. */ |
204 | buffer[2] &= ~0x20; | 204 | buffer[2] &= ~0x20; |
205 | buffer[2] |= 0x18; | 205 | buffer[2] |= 0x18; |
diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c index 4b77d21067da..58cae6642977 100644 --- a/drivers/media/video/tuner-types.c +++ b/drivers/media/video/tuner-types.c | |||
@@ -874,7 +874,7 @@ static struct tuner_params tuner_philips_fmd1216me_mk3_params[] = { | |||
874 | }; | 874 | }; |
875 | 875 | ||
876 | 876 | ||
877 | /* ------------ TUNER_LG_TDVS_H062F - INFINEON ATSC ------------ */ | 877 | /* ------ TUNER_LG_TDVS_H06XF - LG INNOTEK / INFINEON ATSC ----- */ |
878 | 878 | ||
879 | static struct tuner_range tuner_tua6034_ntsc_ranges[] = { | 879 | static struct tuner_range tuner_tua6034_ntsc_ranges[] = { |
880 | { 16 * 165.00 /*MHz*/, 0x8e, 0x01 }, | 880 | { 16 * 165.00 /*MHz*/, 0x8e, 0x01 }, |
@@ -883,7 +883,7 @@ static struct tuner_range tuner_tua6034_ntsc_ranges[] = { | |||
883 | }; | 883 | }; |
884 | 884 | ||
885 | 885 | ||
886 | static struct tuner_params tuner_tua6034_params[] = { | 886 | static struct tuner_params tuner_lg_tdvs_h06xf_params[] = { |
887 | { | 887 | { |
888 | .type = TUNER_PARAM_TYPE_NTSC, | 888 | .type = TUNER_PARAM_TYPE_NTSC, |
889 | .ranges = tuner_tua6034_ntsc_ranges, | 889 | .ranges = tuner_tua6034_ntsc_ranges, |
@@ -1370,10 +1370,10 @@ struct tunertype tuners[] = { | |||
1370 | .params = tuner_philips_fmd1216me_mk3_params, | 1370 | .params = tuner_philips_fmd1216me_mk3_params, |
1371 | .count = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_params), | 1371 | .count = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_params), |
1372 | }, | 1372 | }, |
1373 | [TUNER_LG_TDVS_H062F] = { /* LGINNOTEK ATSC */ | 1373 | [TUNER_LG_TDVS_H06XF] = { /* LGINNOTEK ATSC */ |
1374 | .name = "LG TDVS-H06xF", /* H061F, H062F & H064F */ | 1374 | .name = "LG TDVS-H06xF", /* H061F, H062F & H064F */ |
1375 | .params = tuner_tua6034_params, | 1375 | .params = tuner_lg_tdvs_h06xf_params, |
1376 | .count = ARRAY_SIZE(tuner_tua6034_params), | 1376 | .count = ARRAY_SIZE(tuner_lg_tdvs_h06xf_params), |
1377 | }, | 1377 | }, |
1378 | [TUNER_YMEC_TVF66T5_B_DFF] = { /* Philips PAL */ | 1378 | [TUNER_YMEC_TVF66T5_B_DFF] = { /* Philips PAL */ |
1379 | .name = "Ymec TVF66T5-B/DFF", | 1379 | .name = "Ymec TVF66T5-B/DFF", |
diff --git a/include/media/tuner.h b/include/media/tuner.h index 0f4f2de65042..1601014c3f1e 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h | |||
@@ -108,7 +108,7 @@ | |||
108 | #define TUNER_TEA5767 62 /* Only FM Radio Tuner */ | 108 | #define TUNER_TEA5767 62 /* Only FM Radio Tuner */ |
109 | #define TUNER_PHILIPS_FMD1216ME_MK3 63 | 109 | #define TUNER_PHILIPS_FMD1216ME_MK3 63 |
110 | 110 | ||
111 | #define TUNER_LG_TDVS_H062F 64 /* DViCO FusionHDTV 5 */ | 111 | #define TUNER_LG_TDVS_H06XF 64 /* TDVS H061F, H062F, H064F */ |
112 | #define TUNER_YMEC_TVF66T5_B_DFF 65 /* Acorp Y878F */ | 112 | #define TUNER_YMEC_TVF66T5_B_DFF 65 /* Acorp Y878F */ |
113 | #define TUNER_LG_TALN 66 | 113 | #define TUNER_LG_TALN 66 |
114 | #define TUNER_PHILIPS_TD1316 67 | 114 | #define TUNER_PHILIPS_TD1316 67 |