aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-09-09 16:03:47 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 16:57:50 -0400
commit272435dc44f7254c7174d69b41eb430a50583d1a (patch)
treebc1f21b6009e0248fcaeb218e99bf9c40d9f3b13 /drivers/media/video
parentc0e9eae60e8f1a18e2e6502b3e738dd2886d18ff (diff)
[PATCH] v4l: syncs tveeprom tuners list with the list from ivtv
- Syncs tveeprom tuners list with the list from ivtv. - Fixes the incorrect reporting of the radio presence. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/tveeprom.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index d0a00d3a6c4f..367401449e3c 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -152,7 +152,7 @@ hauppauge_tuner[] =
152 { TUNER_MICROTUNE_4049FM5, "Microtune 4049 FM5"}, 152 { TUNER_MICROTUNE_4049FM5, "Microtune 4049 FM5"},
153 { TUNER_ABSENT, "LG TPI8NSR11F"}, 153 { TUNER_ABSENT, "LG TPI8NSR11F"},
154 { TUNER_ABSENT, "Microtune 4049 FM5 Alt I2C"}, 154 { TUNER_ABSENT, "Microtune 4049 FM5 Alt I2C"},
155 { TUNER_ABSENT, "Philips FQ1216ME MK3"}, 155 { TUNER_PHILIPS_FM1216ME_MK3, "Philips FQ1216ME MK3"},
156 { TUNER_ABSENT, "Philips FI1236 MK3"}, 156 { TUNER_ABSENT, "Philips FI1236 MK3"},
157 { TUNER_PHILIPS_FM1216ME_MK3, "Philips FM1216 ME MK3"}, 157 { TUNER_PHILIPS_FM1216ME_MK3, "Philips FM1216 ME MK3"},
158 { TUNER_PHILIPS_FM1236_MK3, "Philips FM1236 MK3"}, 158 { TUNER_PHILIPS_FM1236_MK3, "Philips FM1236 MK3"},
@@ -167,7 +167,7 @@ hauppauge_tuner[] =
167 { TUNER_ABSENT, "Temic 4106FH5"}, 167 { TUNER_ABSENT, "Temic 4106FH5"},
168 { TUNER_ABSENT, "Philips FQ1216LMP MK3"}, 168 { TUNER_ABSENT, "Philips FQ1216LMP MK3"},
169 { TUNER_LG_NTSC_TAPE, "LG TAPE H001F MK3"}, 169 { TUNER_LG_NTSC_TAPE, "LG TAPE H001F MK3"},
170 { TUNER_ABSENT, "LG TAPE H701F MK3"}, 170 { TUNER_LG_NTSC_TAPE, "LG TAPE H701F MK3"},
171 /* 70-79 */ 171 /* 70-79 */
172 { TUNER_ABSENT, "LG TALN H200T"}, 172 { TUNER_ABSENT, "LG TALN H200T"},
173 { TUNER_ABSENT, "LG TALN H250T"}, 173 { TUNER_ABSENT, "LG TALN H250T"},
@@ -199,6 +199,13 @@ hauppauge_tuner[] =
199 { TUNER_ABSENT, "Philips FQ1236 MK5"}, 199 { TUNER_ABSENT, "Philips FQ1236 MK5"},
200 { TUNER_ABSENT, "Unspecified"}, 200 { TUNER_ABSENT, "Unspecified"},
201 { TUNER_LG_PAL_TAPE, "LG PAL (TAPE Series)"}, 201 { TUNER_LG_PAL_TAPE, "LG PAL (TAPE Series)"},
202 { TUNER_ABSENT, "Unspecified"},
203 { TUNER_TCL_2002N, "TCL 2002N 5H"},
204 /* 100-103 */
205 { TUNER_ABSENT, "Unspecified"},
206 { TUNER_ABSENT, "Unspecified"},
207 { TUNER_ABSENT, "Unspecified"},
208 { TUNER_PHILIPS_FM1236_MK3, "TCL MFNM05 4"},
202}; 209};
203 210
204static char *sndtype[] = { 211static char *sndtype[] = {
@@ -484,6 +491,7 @@ tveeprom_command(struct i2c_client *client,
484 eeprom_props[1] = eeprom.tuner_formats; 491 eeprom_props[1] = eeprom.tuner_formats;
485 eeprom_props[2] = eeprom.model; 492 eeprom_props[2] = eeprom.model;
486 eeprom_props[3] = eeprom.revision; 493 eeprom_props[3] = eeprom.revision;
494 eeprom_props[4] = eeprom.has_radio;
487 break; 495 break;
488 default: 496 default:
489 return -EINVAL; 497 return -EINVAL;