diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 450 |
1 files changed, 423 insertions, 27 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index fdb19449d269..06861b782b95 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -1669,6 +1669,39 @@ struct saa7134_board saa7134_boards[] = { | |||
1669 | .amux = LINE1, | 1669 | .amux = LINE1, |
1670 | }, | 1670 | }, |
1671 | }, | 1671 | }, |
1672 | [SAA7134_BOARD_AVERMEDIA_CARDBUS_501] = { | ||
1673 | /* Oldrich Jedlicka <oldium.pro@seznam.cz> */ | ||
1674 | .name = "AVerMedia Cardbus TV/Radio (E501R)", | ||
1675 | .audio_clock = 0x187de7, | ||
1676 | .tuner_type = TUNER_ALPS_TSBE5_PAL, | ||
1677 | .radio_type = TUNER_TEA5767, | ||
1678 | .tuner_addr = 0x61, | ||
1679 | .radio_addr = 0x60, | ||
1680 | .tda9887_conf = TDA9887_PRESENT, | ||
1681 | .gpiomask = 0x08000000, | ||
1682 | .inputs = { { | ||
1683 | .name = name_tv, | ||
1684 | .vmux = 1, | ||
1685 | .amux = TV, | ||
1686 | .tv = 1, | ||
1687 | .gpio = 0x08000000, | ||
1688 | }, { | ||
1689 | .name = name_comp1, | ||
1690 | .vmux = 3, | ||
1691 | .amux = LINE1, | ||
1692 | .gpio = 0x08000000, | ||
1693 | }, { | ||
1694 | .name = name_svideo, | ||
1695 | .vmux = 8, | ||
1696 | .amux = LINE1, | ||
1697 | .gpio = 0x08000000, | ||
1698 | } }, | ||
1699 | .radio = { | ||
1700 | .name = name_radio, | ||
1701 | .amux = LINE2, | ||
1702 | .gpio = 0x00000000, | ||
1703 | }, | ||
1704 | }, | ||
1672 | [SAA7134_BOARD_CINERGY400_CARDBUS] = { | 1705 | [SAA7134_BOARD_CINERGY400_CARDBUS] = { |
1673 | .name = "Terratec Cinergy 400 mobile", | 1706 | .name = "Terratec Cinergy 400 mobile", |
1674 | .audio_clock = 0x187de7, | 1707 | .audio_clock = 0x187de7, |
@@ -3331,13 +3364,15 @@ struct saa7134_board saa7134_boards[] = { | |||
3331 | }, | 3364 | }, |
3332 | }, | 3365 | }, |
3333 | [SAA7134_BOARD_HAUPPAUGE_HVR1110R3] = { | 3366 | [SAA7134_BOARD_HAUPPAUGE_HVR1110R3] = { |
3334 | .name = "Hauppauge WinTV-HVR1110r3", | 3367 | .name = "Hauppauge WinTV-HVR1110r3 DVB-T/Hybrid", |
3335 | .audio_clock = 0x00187de7, | 3368 | .audio_clock = 0x00187de7, |
3336 | .tuner_type = TUNER_PHILIPS_TDA8290, | 3369 | .tuner_type = TUNER_PHILIPS_TDA8290, |
3337 | .radio_type = UNSET, | 3370 | .radio_type = UNSET, |
3338 | .tuner_addr = ADDR_UNSET, | 3371 | .tuner_addr = ADDR_UNSET, |
3339 | .radio_addr = ADDR_UNSET, | 3372 | .radio_addr = ADDR_UNSET, |
3340 | .tuner_config = 3, | 3373 | .tuner_config = 3, |
3374 | .mpeg = SAA7134_MPEG_DVB, | ||
3375 | .ts_type = SAA7134_MPEG_TS_SERIAL, | ||
3341 | .gpiomask = 0x0800100, /* GPIO 21 is an INPUT */ | 3376 | .gpiomask = 0x0800100, /* GPIO 21 is an INPUT */ |
3342 | .inputs = {{ | 3377 | .inputs = {{ |
3343 | .name = name_tv, | 3378 | .name = name_tv, |
@@ -4006,7 +4041,7 @@ struct saa7134_board saa7134_boards[] = { | |||
4006 | [SAA7134_BOARD_BEHOLD_505FM] = { | 4041 | [SAA7134_BOARD_BEHOLD_505FM] = { |
4007 | /* Beholder Intl. Ltd. 2008 */ | 4042 | /* Beholder Intl. Ltd. 2008 */ |
4008 | /*Dmitry Belimov <d.belimov@gmail.com> */ | 4043 | /*Dmitry Belimov <d.belimov@gmail.com> */ |
4009 | .name = "Beholder BeholdTV 505 FM/RDS", | 4044 | .name = "Beholder BeholdTV 505 FM", |
4010 | .audio_clock = 0x00200000, | 4045 | .audio_clock = 0x00200000, |
4011 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | 4046 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, |
4012 | .radio_type = UNSET, | 4047 | .radio_type = UNSET, |
@@ -4019,6 +4054,40 @@ struct saa7134_board saa7134_boards[] = { | |||
4019 | .vmux = 3, | 4054 | .vmux = 3, |
4020 | .amux = LINE2, | 4055 | .amux = LINE2, |
4021 | .tv = 1, | 4056 | .tv = 1, |
4057 | }, { | ||
4058 | .name = name_comp1, | ||
4059 | .vmux = 1, | ||
4060 | .amux = LINE1, | ||
4061 | }, { | ||
4062 | .name = name_svideo, | ||
4063 | .vmux = 8, | ||
4064 | .amux = LINE1, | ||
4065 | } }, | ||
4066 | .mute = { | ||
4067 | .name = name_mute, | ||
4068 | .amux = LINE1, | ||
4069 | }, | ||
4070 | .radio = { | ||
4071 | .name = name_radio, | ||
4072 | .amux = LINE2, | ||
4073 | }, | ||
4074 | }, | ||
4075 | [SAA7134_BOARD_BEHOLD_505RDS] = { | ||
4076 | /* Beholder Intl. Ltd. 2008 */ | ||
4077 | /*Dmitry Belimov <d.belimov@gmail.com> */ | ||
4078 | .name = "Beholder BeholdTV 505 RDS", | ||
4079 | .audio_clock = 0x00200000, | ||
4080 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */ | ||
4081 | .radio_type = UNSET, | ||
4082 | .tuner_addr = ADDR_UNSET, | ||
4083 | .radio_addr = ADDR_UNSET, | ||
4084 | .tda9887_conf = TDA9887_PRESENT, | ||
4085 | .gpiomask = 0x00008000, | ||
4086 | .inputs = {{ | ||
4087 | .name = name_tv, | ||
4088 | .vmux = 3, | ||
4089 | .amux = LINE2, | ||
4090 | .tv = 1, | ||
4022 | },{ | 4091 | },{ |
4023 | .name = name_comp1, | 4092 | .name = name_comp1, |
4024 | .vmux = 1, | 4093 | .vmux = 1, |
@@ -4040,7 +4109,7 @@ struct saa7134_board saa7134_boards[] = { | |||
4040 | [SAA7134_BOARD_BEHOLD_507_9FM] = { | 4109 | [SAA7134_BOARD_BEHOLD_507_9FM] = { |
4041 | /* Beholder Intl. Ltd. 2008 */ | 4110 | /* Beholder Intl. Ltd. 2008 */ |
4042 | /*Dmitry Belimov <d.belimov@gmail.com> */ | 4111 | /*Dmitry Belimov <d.belimov@gmail.com> */ |
4043 | .name = "Beholder BeholdTV 507 FM/RDS / BeholdTV 509 FM", | 4112 | .name = "Beholder BeholdTV 507 FM / BeholdTV 509 FM", |
4044 | .audio_clock = 0x00187de7, | 4113 | .audio_clock = 0x00187de7, |
4045 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | 4114 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, |
4046 | .radio_type = UNSET, | 4115 | .radio_type = UNSET, |
@@ -4067,6 +4136,66 @@ struct saa7134_board saa7134_boards[] = { | |||
4067 | .amux = LINE2, | 4136 | .amux = LINE2, |
4068 | }, | 4137 | }, |
4069 | }, | 4138 | }, |
4139 | [SAA7134_BOARD_BEHOLD_507RDS_MK5] = { | ||
4140 | /* Beholder Intl. Ltd. 2008 */ | ||
4141 | /*Dmitry Belimov <d.belimov@gmail.com> */ | ||
4142 | .name = "Beholder BeholdTV 507 RDS", | ||
4143 | .audio_clock = 0x00187de7, | ||
4144 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */ | ||
4145 | .radio_type = UNSET, | ||
4146 | .tuner_addr = ADDR_UNSET, | ||
4147 | .radio_addr = ADDR_UNSET, | ||
4148 | .tda9887_conf = TDA9887_PRESENT, | ||
4149 | .gpiomask = 0x00008000, | ||
4150 | .inputs = {{ | ||
4151 | .name = name_tv, | ||
4152 | .vmux = 3, | ||
4153 | .amux = TV, | ||
4154 | .tv = 1, | ||
4155 | }, { | ||
4156 | .name = name_comp1, | ||
4157 | .vmux = 1, | ||
4158 | .amux = LINE1, | ||
4159 | }, { | ||
4160 | .name = name_svideo, | ||
4161 | .vmux = 8, | ||
4162 | .amux = LINE1, | ||
4163 | } }, | ||
4164 | .radio = { | ||
4165 | .name = name_radio, | ||
4166 | .amux = LINE2, | ||
4167 | }, | ||
4168 | }, | ||
4169 | [SAA7134_BOARD_BEHOLD_507RDS_MK3] = { | ||
4170 | /* Beholder Intl. Ltd. 2008 */ | ||
4171 | /*Dmitry Belimov <d.belimov@gmail.com> */ | ||
4172 | .name = "Beholder BeholdTV 507 RDS", | ||
4173 | .audio_clock = 0x00187de7, | ||
4174 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | ||
4175 | .radio_type = UNSET, | ||
4176 | .tuner_addr = ADDR_UNSET, | ||
4177 | .radio_addr = ADDR_UNSET, | ||
4178 | .tda9887_conf = TDA9887_PRESENT, | ||
4179 | .gpiomask = 0x00008000, | ||
4180 | .inputs = {{ | ||
4181 | .name = name_tv, | ||
4182 | .vmux = 3, | ||
4183 | .amux = TV, | ||
4184 | .tv = 1, | ||
4185 | }, { | ||
4186 | .name = name_comp1, | ||
4187 | .vmux = 1, | ||
4188 | .amux = LINE1, | ||
4189 | }, { | ||
4190 | .name = name_svideo, | ||
4191 | .vmux = 8, | ||
4192 | .amux = LINE1, | ||
4193 | } }, | ||
4194 | .radio = { | ||
4195 | .name = name_radio, | ||
4196 | .amux = LINE2, | ||
4197 | }, | ||
4198 | }, | ||
4070 | [SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM] = { | 4199 | [SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM] = { |
4071 | /* Beholder Intl. Ltd. 2008 */ | 4200 | /* Beholder Intl. Ltd. 2008 */ |
4072 | /*Dmitry Belimov <d.belimov@gmail.com> */ | 4201 | /*Dmitry Belimov <d.belimov@gmail.com> */ |
@@ -4101,9 +4230,121 @@ struct saa7134_board saa7134_boards[] = { | |||
4101 | .gpio = 0x000A8000, | 4230 | .gpio = 0x000A8000, |
4102 | }, | 4231 | }, |
4103 | }, | 4232 | }, |
4104 | [SAA7134_BOARD_BEHOLD_607_9FM] = { | 4233 | [SAA7134_BOARD_BEHOLD_607FM_MK3] = { |
4234 | /* Andrey Melnikoff <temnota@kmv.ru> */ | ||
4235 | .name = "Beholder BeholdTV 607 FM", | ||
4236 | .audio_clock = 0x00187de7, | ||
4237 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | ||
4238 | .radio_type = UNSET, | ||
4239 | .tuner_addr = ADDR_UNSET, | ||
4240 | .radio_addr = ADDR_UNSET, | ||
4241 | .tda9887_conf = TDA9887_PRESENT, | ||
4242 | .inputs = {{ | ||
4243 | .name = name_tv, | ||
4244 | .vmux = 3, | ||
4245 | .amux = TV, | ||
4246 | .tv = 1, | ||
4247 | }, { | ||
4248 | .name = name_comp1, | ||
4249 | .vmux = 1, | ||
4250 | .amux = LINE1, | ||
4251 | }, { | ||
4252 | .name = name_svideo, | ||
4253 | .vmux = 8, | ||
4254 | .amux = LINE1, | ||
4255 | } }, | ||
4256 | .radio = { | ||
4257 | .name = name_radio, | ||
4258 | .amux = LINE2, | ||
4259 | }, | ||
4260 | }, | ||
4261 | [SAA7134_BOARD_BEHOLD_609FM_MK3] = { | ||
4262 | /* Andrey Melnikoff <temnota@kmv.ru> */ | ||
4263 | .name = "Beholder BeholdTV 609 FM", | ||
4264 | .audio_clock = 0x00187de7, | ||
4265 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | ||
4266 | .radio_type = UNSET, | ||
4267 | .tuner_addr = ADDR_UNSET, | ||
4268 | .radio_addr = ADDR_UNSET, | ||
4269 | .tda9887_conf = TDA9887_PRESENT, | ||
4270 | .inputs = {{ | ||
4271 | .name = name_tv, | ||
4272 | .vmux = 3, | ||
4273 | .amux = TV, | ||
4274 | .tv = 1, | ||
4275 | }, { | ||
4276 | .name = name_comp1, | ||
4277 | .vmux = 1, | ||
4278 | .amux = LINE1, | ||
4279 | }, { | ||
4280 | .name = name_svideo, | ||
4281 | .vmux = 8, | ||
4282 | .amux = LINE1, | ||
4283 | } }, | ||
4284 | .radio = { | ||
4285 | .name = name_radio, | ||
4286 | .amux = LINE2, | ||
4287 | }, | ||
4288 | }, | ||
4289 | [SAA7134_BOARD_BEHOLD_607FM_MK5] = { | ||
4290 | /* Andrey Melnikoff <temnota@kmv.ru> */ | ||
4291 | .name = "Beholder BeholdTV 607 FM", | ||
4292 | .audio_clock = 0x00187de7, | ||
4293 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */ | ||
4294 | .radio_type = UNSET, | ||
4295 | .tuner_addr = ADDR_UNSET, | ||
4296 | .radio_addr = ADDR_UNSET, | ||
4297 | .tda9887_conf = TDA9887_PRESENT, | ||
4298 | .inputs = {{ | ||
4299 | .name = name_tv, | ||
4300 | .vmux = 3, | ||
4301 | .amux = TV, | ||
4302 | .tv = 1, | ||
4303 | }, { | ||
4304 | .name = name_comp1, | ||
4305 | .vmux = 1, | ||
4306 | .amux = LINE1, | ||
4307 | }, { | ||
4308 | .name = name_svideo, | ||
4309 | .vmux = 8, | ||
4310 | .amux = LINE1, | ||
4311 | } }, | ||
4312 | .radio = { | ||
4313 | .name = name_radio, | ||
4314 | .amux = LINE2, | ||
4315 | }, | ||
4316 | }, | ||
4317 | [SAA7134_BOARD_BEHOLD_609FM_MK5] = { | ||
4105 | /* Andrey Melnikoff <temnota@kmv.ru> */ | 4318 | /* Andrey Melnikoff <temnota@kmv.ru> */ |
4106 | .name = "Beholder BeholdTV 607 / BeholdTV 609", | 4319 | .name = "Beholder BeholdTV 609 FM", |
4320 | .audio_clock = 0x00187de7, | ||
4321 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */ | ||
4322 | .radio_type = UNSET, | ||
4323 | .tuner_addr = ADDR_UNSET, | ||
4324 | .radio_addr = ADDR_UNSET, | ||
4325 | .tda9887_conf = TDA9887_PRESENT, | ||
4326 | .inputs = {{ | ||
4327 | .name = name_tv, | ||
4328 | .vmux = 3, | ||
4329 | .amux = TV, | ||
4330 | .tv = 1, | ||
4331 | }, { | ||
4332 | .name = name_comp1, | ||
4333 | .vmux = 1, | ||
4334 | .amux = LINE1, | ||
4335 | }, { | ||
4336 | .name = name_svideo, | ||
4337 | .vmux = 8, | ||
4338 | .amux = LINE1, | ||
4339 | } }, | ||
4340 | .radio = { | ||
4341 | .name = name_radio, | ||
4342 | .amux = LINE2, | ||
4343 | }, | ||
4344 | }, | ||
4345 | [SAA7134_BOARD_BEHOLD_607RDS_MK3] = { | ||
4346 | /* Andrey Melnikoff <temnota@kmv.ru> */ | ||
4347 | .name = "Beholder BeholdTV 607 RDS", | ||
4107 | .audio_clock = 0x00187de7, | 4348 | .audio_clock = 0x00187de7, |
4108 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | 4349 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, |
4109 | .radio_type = UNSET, | 4350 | .radio_type = UNSET, |
@@ -4115,6 +4356,90 @@ struct saa7134_board saa7134_boards[] = { | |||
4115 | .vmux = 3, | 4356 | .vmux = 3, |
4116 | .amux = TV, | 4357 | .amux = TV, |
4117 | .tv = 1, | 4358 | .tv = 1, |
4359 | }, { | ||
4360 | .name = name_comp1, | ||
4361 | .vmux = 1, | ||
4362 | .amux = LINE1, | ||
4363 | }, { | ||
4364 | .name = name_svideo, | ||
4365 | .vmux = 8, | ||
4366 | .amux = LINE1, | ||
4367 | } }, | ||
4368 | .radio = { | ||
4369 | .name = name_radio, | ||
4370 | .amux = LINE2, | ||
4371 | }, | ||
4372 | }, | ||
4373 | [SAA7134_BOARD_BEHOLD_609RDS_MK3] = { | ||
4374 | /* Andrey Melnikoff <temnota@kmv.ru> */ | ||
4375 | .name = "Beholder BeholdTV 609 RDS", | ||
4376 | .audio_clock = 0x00187de7, | ||
4377 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | ||
4378 | .radio_type = UNSET, | ||
4379 | .tuner_addr = ADDR_UNSET, | ||
4380 | .radio_addr = ADDR_UNSET, | ||
4381 | .tda9887_conf = TDA9887_PRESENT, | ||
4382 | .inputs = {{ | ||
4383 | .name = name_tv, | ||
4384 | .vmux = 3, | ||
4385 | .amux = TV, | ||
4386 | .tv = 1, | ||
4387 | }, { | ||
4388 | .name = name_comp1, | ||
4389 | .vmux = 1, | ||
4390 | .amux = LINE1, | ||
4391 | }, { | ||
4392 | .name = name_svideo, | ||
4393 | .vmux = 8, | ||
4394 | .amux = LINE1, | ||
4395 | } }, | ||
4396 | .radio = { | ||
4397 | .name = name_radio, | ||
4398 | .amux = LINE2, | ||
4399 | }, | ||
4400 | }, | ||
4401 | [SAA7134_BOARD_BEHOLD_607RDS_MK5] = { | ||
4402 | /* Andrey Melnikoff <temnota@kmv.ru> */ | ||
4403 | .name = "Beholder BeholdTV 607 RDS", | ||
4404 | .audio_clock = 0x00187de7, | ||
4405 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */ | ||
4406 | .radio_type = UNSET, | ||
4407 | .tuner_addr = ADDR_UNSET, | ||
4408 | .radio_addr = ADDR_UNSET, | ||
4409 | .tda9887_conf = TDA9887_PRESENT, | ||
4410 | .inputs = {{ | ||
4411 | .name = name_tv, | ||
4412 | .vmux = 3, | ||
4413 | .amux = TV, | ||
4414 | .tv = 1, | ||
4415 | }, { | ||
4416 | .name = name_comp1, | ||
4417 | .vmux = 1, | ||
4418 | .amux = LINE1, | ||
4419 | }, { | ||
4420 | .name = name_svideo, | ||
4421 | .vmux = 8, | ||
4422 | .amux = LINE1, | ||
4423 | } }, | ||
4424 | .radio = { | ||
4425 | .name = name_radio, | ||
4426 | .amux = LINE2, | ||
4427 | }, | ||
4428 | }, | ||
4429 | [SAA7134_BOARD_BEHOLD_609RDS_MK5] = { | ||
4430 | /* Andrey Melnikoff <temnota@kmv.ru> */ | ||
4431 | .name = "Beholder BeholdTV 609 RDS", | ||
4432 | .audio_clock = 0x00187de7, | ||
4433 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */ | ||
4434 | .radio_type = UNSET, | ||
4435 | .tuner_addr = ADDR_UNSET, | ||
4436 | .radio_addr = ADDR_UNSET, | ||
4437 | .tda9887_conf = TDA9887_PRESENT, | ||
4438 | .inputs = {{ | ||
4439 | .name = name_tv, | ||
4440 | .vmux = 3, | ||
4441 | .amux = TV, | ||
4442 | .tv = 1, | ||
4118 | },{ | 4443 | },{ |
4119 | .name = name_comp1, | 4444 | .name = name_comp1, |
4120 | .vmux = 1, | 4445 | .vmux = 1, |
@@ -4133,6 +4458,7 @@ struct saa7134_board saa7134_boards[] = { | |||
4133 | /* Igor Kuznetsov <igk@igk.ru> */ | 4458 | /* Igor Kuznetsov <igk@igk.ru> */ |
4134 | /* Andrey Melnikoff <temnota@kmv.ru> */ | 4459 | /* Andrey Melnikoff <temnota@kmv.ru> */ |
4135 | /* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */ | 4460 | /* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */ |
4461 | /* Alexey Osipov <lion-simba@pridelands.ru> */ | ||
4136 | .name = "Beholder BeholdTV M6", | 4462 | .name = "Beholder BeholdTV M6", |
4137 | .audio_clock = 0x00187de7, | 4463 | .audio_clock = 0x00187de7, |
4138 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | 4464 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, |
@@ -4207,10 +4533,10 @@ struct saa7134_board saa7134_boards[] = { | |||
4207 | /* Igor Kuznetsov <igk@igk.ru> */ | 4533 | /* Igor Kuznetsov <igk@igk.ru> */ |
4208 | /* Andrey Melnikoff <temnota@kmv.ru> */ | 4534 | /* Andrey Melnikoff <temnota@kmv.ru> */ |
4209 | /* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */ | 4535 | /* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */ |
4536 | /* Alexey Osipov <lion-simba@pridelands.ru> */ | ||
4210 | .name = "Beholder BeholdTV M6 Extra", | 4537 | .name = "Beholder BeholdTV M6 Extra", |
4211 | .audio_clock = 0x00187de7, | 4538 | .audio_clock = 0x00187de7, |
4212 | /* FIXME: Must be PHILIPS_FM1216ME_MK5*/ | 4539 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */ |
4213 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, | ||
4214 | .radio_type = UNSET, | 4540 | .radio_type = UNSET, |
4215 | .tuner_addr = ADDR_UNSET, | 4541 | .tuner_addr = ADDR_UNSET, |
4216 | .radio_addr = ADDR_UNSET, | 4542 | .radio_addr = ADDR_UNSET, |
@@ -4465,7 +4791,6 @@ struct saa7134_board saa7134_boards[] = { | |||
4465 | .radio_type = UNSET, | 4791 | .radio_type = UNSET, |
4466 | .tuner_addr = ADDR_UNSET, | 4792 | .tuner_addr = ADDR_UNSET, |
4467 | .radio_addr = ADDR_UNSET, | 4793 | .radio_addr = ADDR_UNSET, |
4468 | .mpeg = SAA7134_MPEG_DVB, | ||
4469 | .inputs = {{ | 4794 | .inputs = {{ |
4470 | .name = name_tv, | 4795 | .name = name_tv, |
4471 | .vmux = 3, | 4796 | .vmux = 3, |
@@ -4753,6 +5078,44 @@ struct saa7134_board saa7134_boards[] = { | |||
4753 | .gpio = 0x01, | 5078 | .gpio = 0x01, |
4754 | }, | 5079 | }, |
4755 | }, | 5080 | }, |
5081 | [SAA7134_BOARD_AVERMEDIA_STUDIO_507UA] = { | ||
5082 | /* Andy Shevchenko <andy@smile.org.ua> */ | ||
5083 | .name = "Avermedia AVerTV Studio 507UA", | ||
5084 | .audio_clock = 0x00187de7, | ||
5085 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* Should be MK5 */ | ||
5086 | .radio_type = UNSET, | ||
5087 | .tuner_addr = ADDR_UNSET, | ||
5088 | .radio_addr = ADDR_UNSET, | ||
5089 | .tda9887_conf = TDA9887_PRESENT, | ||
5090 | .gpiomask = 0x03, | ||
5091 | .inputs = { { | ||
5092 | .name = name_tv, | ||
5093 | .vmux = 1, | ||
5094 | .amux = TV, | ||
5095 | .tv = 1, | ||
5096 | .gpio = 0x00, | ||
5097 | }, { | ||
5098 | .name = name_comp1, | ||
5099 | .vmux = 3, | ||
5100 | .amux = LINE1, | ||
5101 | .gpio = 0x00, | ||
5102 | }, { | ||
5103 | .name = name_svideo, | ||
5104 | .vmux = 8, | ||
5105 | .amux = LINE1, | ||
5106 | .gpio = 0x00, | ||
5107 | } }, | ||
5108 | .radio = { | ||
5109 | .name = name_radio, | ||
5110 | .amux = LINE2, | ||
5111 | .gpio = 0x01, | ||
5112 | }, | ||
5113 | .mute = { | ||
5114 | .name = name_mute, | ||
5115 | .amux = LINE1, | ||
5116 | .gpio = 0x00, | ||
5117 | }, | ||
5118 | }, | ||
4756 | }; | 5119 | }; |
4757 | 5120 | ||
4758 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); | 5121 | const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); |
@@ -5027,6 +5390,13 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
5027 | .subdevice = 0xd6ee, | 5390 | .subdevice = 0xd6ee, |
5028 | .driver_data = SAA7134_BOARD_AVERMEDIA_CARDBUS, | 5391 | .driver_data = SAA7134_BOARD_AVERMEDIA_CARDBUS, |
5029 | },{ | 5392 | },{ |
5393 | /* AVerMedia CardBus */ | ||
5394 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
5395 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | ||
5396 | .subvendor = 0x1461, /* Avermedia Technologies Inc */ | ||
5397 | .subdevice = 0xb7e9, | ||
5398 | .driver_data = SAA7134_BOARD_AVERMEDIA_CARDBUS_501, | ||
5399 | }, { | ||
5030 | /* TransGear 3000TV */ | 5400 | /* TransGear 3000TV */ |
5031 | .vendor = PCI_VENDOR_ID_PHILIPS, | 5401 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5032 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, | 5402 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, |
@@ -5441,6 +5811,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
5441 | .driver_data = SAA7134_BOARD_AVERMEDIA_STUDIO_507, | 5811 | .driver_data = SAA7134_BOARD_AVERMEDIA_STUDIO_507, |
5442 | },{ | 5812 | },{ |
5443 | .vendor = PCI_VENDOR_ID_PHILIPS, | 5813 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5814 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | ||
5815 | .subvendor = 0x1461, /* Avermedia Technologies Inc */ | ||
5816 | .subdevice = 0xa11b, | ||
5817 | .driver_data = SAA7134_BOARD_AVERMEDIA_STUDIO_507UA, | ||
5818 | }, { | ||
5819 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
5444 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | 5820 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, |
5445 | .subvendor = 0x1043, | 5821 | .subvendor = 0x1043, |
5446 | .subdevice = 0x4876, | 5822 | .subdevice = 0x4876, |
@@ -5647,14 +6023,8 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
5647 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6023 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5648 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, | 6024 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, |
5649 | .subvendor = 0x0000, | 6025 | .subvendor = 0x0000, |
5650 | .subdevice = 0x5051, | ||
5651 | .driver_data = SAA7134_BOARD_BEHOLD_505FM, | ||
5652 | },{ | ||
5653 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
5654 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, | ||
5655 | .subvendor = 0x0000, | ||
5656 | .subdevice = 0x505B, | 6026 | .subdevice = 0x505B, |
5657 | .driver_data = SAA7134_BOARD_BEHOLD_505FM, | 6027 | .driver_data = SAA7134_BOARD_BEHOLD_505RDS, |
5658 | },{ | 6028 | },{ |
5659 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6029 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5660 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, | 6030 | .device = PCI_DEVICE_ID_PHILIPS_SAA7130, |
@@ -5666,13 +6036,13 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
5666 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | 6036 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, |
5667 | .subvendor = 0x0000, | 6037 | .subvendor = 0x0000, |
5668 | .subdevice = 0x5071, | 6038 | .subdevice = 0x5071, |
5669 | .driver_data = SAA7134_BOARD_BEHOLD_507_9FM, | 6039 | .driver_data = SAA7134_BOARD_BEHOLD_507RDS_MK3, |
5670 | },{ | 6040 | },{ |
5671 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6041 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5672 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | 6042 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, |
5673 | .subvendor = 0x0000, | 6043 | .subvendor = 0x0000, |
5674 | .subdevice = 0x507B, | 6044 | .subdevice = 0x507B, |
5675 | .driver_data = SAA7134_BOARD_BEHOLD_507_9FM, | 6045 | .driver_data = SAA7134_BOARD_BEHOLD_507RDS_MK5, |
5676 | },{ | 6046 | },{ |
5677 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6047 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5678 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 6048 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
@@ -5696,49 +6066,49 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
5696 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 6066 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
5697 | .subvendor = 0x5ace, | 6067 | .subvendor = 0x5ace, |
5698 | .subdevice = 0x6070, | 6068 | .subdevice = 0x6070, |
5699 | .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, | 6069 | .driver_data = SAA7134_BOARD_BEHOLD_607FM_MK3, |
5700 | },{ | 6070 | },{ |
5701 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6071 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5702 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 6072 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
5703 | .subvendor = 0x5ace, | 6073 | .subvendor = 0x5ace, |
5704 | .subdevice = 0x6071, | 6074 | .subdevice = 0x6071, |
5705 | .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, | 6075 | .driver_data = SAA7134_BOARD_BEHOLD_607FM_MK5, |
5706 | },{ | 6076 | },{ |
5707 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6077 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5708 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 6078 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
5709 | .subvendor = 0x5ace, | 6079 | .subvendor = 0x5ace, |
5710 | .subdevice = 0x6072, | 6080 | .subdevice = 0x6072, |
5711 | .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, | 6081 | .driver_data = SAA7134_BOARD_BEHOLD_607RDS_MK3, |
5712 | },{ | 6082 | },{ |
5713 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6083 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5714 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 6084 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
5715 | .subvendor = 0x5ace, | 6085 | .subvendor = 0x5ace, |
5716 | .subdevice = 0x6073, | 6086 | .subdevice = 0x6073, |
5717 | .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, | 6087 | .driver_data = SAA7134_BOARD_BEHOLD_607RDS_MK5, |
5718 | },{ | 6088 | },{ |
5719 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6089 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5720 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | 6090 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, |
5721 | .subvendor = 0x5ace, | 6091 | .subvendor = 0x5ace, |
5722 | .subdevice = 0x6090, | 6092 | .subdevice = 0x6090, |
5723 | .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, | 6093 | .driver_data = SAA7134_BOARD_BEHOLD_609FM_MK3, |
5724 | },{ | 6094 | },{ |
5725 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6095 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5726 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | 6096 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, |
5727 | .subvendor = 0x5ace, | 6097 | .subvendor = 0x5ace, |
5728 | .subdevice = 0x6091, | 6098 | .subdevice = 0x6091, |
5729 | .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, | 6099 | .driver_data = SAA7134_BOARD_BEHOLD_609FM_MK5, |
5730 | },{ | 6100 | },{ |
5731 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6101 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5732 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | 6102 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, |
5733 | .subvendor = 0x5ace, | 6103 | .subvendor = 0x5ace, |
5734 | .subdevice = 0x6092, | 6104 | .subdevice = 0x6092, |
5735 | .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, | 6105 | .driver_data = SAA7134_BOARD_BEHOLD_609RDS_MK3, |
5736 | },{ | 6106 | },{ |
5737 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6107 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5738 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | 6108 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, |
5739 | .subvendor = 0x5ace, | 6109 | .subvendor = 0x5ace, |
5740 | .subdevice = 0x6093, | 6110 | .subdevice = 0x6093, |
5741 | .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, | 6111 | .driver_data = SAA7134_BOARD_BEHOLD_609RDS_MK5, |
5742 | },{ | 6112 | },{ |
5743 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6113 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5744 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | 6114 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, |
@@ -5832,6 +6202,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
5832 | }, { | 6202 | }, { |
5833 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6203 | .vendor = PCI_VENDOR_ID_PHILIPS, |
5834 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | 6204 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, |
6205 | .subvendor = 0x1461, /* Avermedia Technologies Inc */ | ||
6206 | .subdevice = 0xf736, | ||
6207 | .driver_data = SAA7134_BOARD_AVERMEDIA_M103, | ||
6208 | }, { | ||
6209 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
6210 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
5835 | .subvendor = 0x1043, | 6211 | .subvendor = 0x1043, |
5836 | .subdevice = 0x4878, /* REV:1.02G */ | 6212 | .subdevice = 0x4878, /* REV:1.02G */ |
5837 | .driver_data = SAA7134_BOARD_ASUSTeK_TIGER_3IN1, | 6213 | .driver_data = SAA7134_BOARD_ASUSTeK_TIGER_3IN1, |
@@ -6114,7 +6490,6 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
6114 | case SAA7134_BOARD_VIDEOMATE_DVBT_300: | 6490 | case SAA7134_BOARD_VIDEOMATE_DVBT_300: |
6115 | case SAA7134_BOARD_VIDEOMATE_DVBT_200: | 6491 | case SAA7134_BOARD_VIDEOMATE_DVBT_200: |
6116 | case SAA7134_BOARD_VIDEOMATE_DVBT_200A: | 6492 | case SAA7134_BOARD_VIDEOMATE_DVBT_200A: |
6117 | case SAA7134_BOARD_VIDEOMATE_T750: | ||
6118 | case SAA7134_BOARD_MANLI_MTV001: | 6493 | case SAA7134_BOARD_MANLI_MTV001: |
6119 | case SAA7134_BOARD_MANLI_MTV002: | 6494 | case SAA7134_BOARD_MANLI_MTV002: |
6120 | case SAA7134_BOARD_BEHOLD_409FM: | 6495 | case SAA7134_BOARD_BEHOLD_409FM: |
@@ -6142,7 +6517,10 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
6142 | case SAA7134_BOARD_BEHOLD_407FM: | 6517 | case SAA7134_BOARD_BEHOLD_407FM: |
6143 | case SAA7134_BOARD_BEHOLD_409: | 6518 | case SAA7134_BOARD_BEHOLD_409: |
6144 | case SAA7134_BOARD_BEHOLD_505FM: | 6519 | case SAA7134_BOARD_BEHOLD_505FM: |
6520 | case SAA7134_BOARD_BEHOLD_505RDS: | ||
6145 | case SAA7134_BOARD_BEHOLD_507_9FM: | 6521 | case SAA7134_BOARD_BEHOLD_507_9FM: |
6522 | case SAA7134_BOARD_BEHOLD_507RDS_MK3: | ||
6523 | case SAA7134_BOARD_BEHOLD_507RDS_MK5: | ||
6146 | case SAA7134_BOARD_GENIUS_TVGO_A11MCE: | 6524 | case SAA7134_BOARD_GENIUS_TVGO_A11MCE: |
6147 | case SAA7134_BOARD_REAL_ANGEL_220: | 6525 | case SAA7134_BOARD_REAL_ANGEL_220: |
6148 | case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG: | 6526 | case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG: |
@@ -6196,6 +6574,16 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
6196 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0xffffffff, 0xffffffff); | 6574 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0xffffffff, 0xffffffff); |
6197 | msleep(10); | 6575 | msleep(10); |
6198 | break; | 6576 | break; |
6577 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_501: | ||
6578 | /* power-down tuner chip */ | ||
6579 | saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x08400000, 0x08400000); | ||
6580 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x08400000, 0); | ||
6581 | msleep(10); | ||
6582 | saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, 0x08400000, 0x08400000); | ||
6583 | saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, 0x08400000, 0x08400000); | ||
6584 | msleep(10); | ||
6585 | dev->has_remote = SAA7134_REMOTE_I2C; | ||
6586 | break; | ||
6199 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_506: | 6587 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_506: |
6200 | saa7134_set_gpio(dev, 23, 0); | 6588 | saa7134_set_gpio(dev, 23, 0); |
6201 | msleep(10); | 6589 | msleep(10); |
@@ -6253,7 +6641,14 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
6253 | case SAA7134_BOARD_UPMOST_PURPLE_TV: | 6641 | case SAA7134_BOARD_UPMOST_PURPLE_TV: |
6254 | case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS: | 6642 | case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS: |
6255 | case SAA7134_BOARD_HAUPPAUGE_HVR1110: | 6643 | case SAA7134_BOARD_HAUPPAUGE_HVR1110: |
6256 | case SAA7134_BOARD_BEHOLD_607_9FM: | 6644 | case SAA7134_BOARD_BEHOLD_607FM_MK3: |
6645 | case SAA7134_BOARD_BEHOLD_607FM_MK5: | ||
6646 | case SAA7134_BOARD_BEHOLD_609FM_MK3: | ||
6647 | case SAA7134_BOARD_BEHOLD_609FM_MK5: | ||
6648 | case SAA7134_BOARD_BEHOLD_607RDS_MK3: | ||
6649 | case SAA7134_BOARD_BEHOLD_607RDS_MK5: | ||
6650 | case SAA7134_BOARD_BEHOLD_609RDS_MK3: | ||
6651 | case SAA7134_BOARD_BEHOLD_609RDS_MK5: | ||
6257 | case SAA7134_BOARD_BEHOLD_M6: | 6652 | case SAA7134_BOARD_BEHOLD_M6: |
6258 | case SAA7134_BOARD_BEHOLD_M63: | 6653 | case SAA7134_BOARD_BEHOLD_M63: |
6259 | case SAA7134_BOARD_BEHOLD_M6_EXTRA: | 6654 | case SAA7134_BOARD_BEHOLD_M6_EXTRA: |
@@ -6635,6 +7030,7 @@ int saa7134_board_init2(struct saa7134_dev *dev) | |||
6635 | 7030 | ||
6636 | switch (dev->board) { | 7031 | switch (dev->board) { |
6637 | case SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM: | 7032 | case SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM: |
7033 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_501: | ||
6638 | { | 7034 | { |
6639 | struct v4l2_priv_tun_config tea5767_cfg; | 7035 | struct v4l2_priv_tun_config tea5767_cfg; |
6640 | struct tea5767_ctrl ctl; | 7036 | struct tea5767_ctrl ctl; |