aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitri Belimov <d.belimov@gmail.com>2009-04-23 01:32:49 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-16 17:20:42 -0400
commit84d728c3df9931d1937e4a76324838ce065c521e (patch)
tree35aaebbab4a0b318c1bad488b9fed5f110952cee
parentd46de9d2364cad55caddc04632707f5739b4cd87 (diff)
V4L/DVB (11604): saa7134: split Behold`s card entries to properly identify the model
Split Beholdr`s cards to correct models. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat
-rw-r--r--Documentation/video4linux/CARDLIST.saa713416
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c341
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c12
-rw-r--r--drivers/media/video/saa7134/saa7134.h12
4 files changed, 352 insertions, 29 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index fb3098d56d85..112ff4f4fd9a 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -124,10 +124,10 @@
124123 -> Beholder BeholdTV 407 [0000:4070] 124123 -> Beholder BeholdTV 407 [0000:4070]
125124 -> Beholder BeholdTV 407 FM [0000:4071] 125124 -> Beholder BeholdTV 407 FM [0000:4071]
126125 -> Beholder BeholdTV 409 [0000:4090] 126125 -> Beholder BeholdTV 409 [0000:4090]
127126 -> Beholder BeholdTV 505 FM/RDS [0000:5051,0000:505B,5ace:5050] 127126 -> Beholder BeholdTV 505 FM [5ace:5050]
128127 -> Beholder BeholdTV 507 FM/RDS / BeholdTV 509 FM [0000:5071,0000:507B,5ace:5070,5ace:5090] 128127 -> Beholder BeholdTV 507 FM / BeholdTV 509 FM [5ace:5070,5ace:5090]
129128 -> Beholder BeholdTV Columbus TVFM [0000:5201] 129128 -> Beholder BeholdTV Columbus TVFM [0000:5201]
130129 -> Beholder BeholdTV 607 / BeholdTV 609 [5ace:6070,5ace:6071,5ace:6072,5ace:6073,5ace:6090,5ace:6091,5ace:6092,5ace:6093] 130129 -> Beholder BeholdTV 607 FM [5ace:6070]
131130 -> Beholder BeholdTV M6 [5ace:6190] 131130 -> Beholder BeholdTV M6 [5ace:6190]
132131 -> Twinhan Hybrid DTV-DVB 3056 PCI [1822:0022] 132131 -> Twinhan Hybrid DTV-DVB 3056 PCI [1822:0022]
133132 -> Genius TVGO AM11MCE 133132 -> Genius TVGO AM11MCE
@@ -157,3 +157,13 @@
157156 -> Hauppauge WinTV-HVR1110r3 [0070:6707,0070:6709,0070:670a] 157156 -> Hauppauge WinTV-HVR1110r3 [0070:6707,0070:6709,0070:670a]
158157 -> Avermedia AVerTV Studio 507UA [1461:a11b] 158157 -> Avermedia AVerTV Studio 507UA [1461:a11b]
159158 -> AVerMedia Cardbus TV/Radio (E501R) [1461:b7e9] 159158 -> AVerMedia Cardbus TV/Radio (E501R) [1461:b7e9]
160159 -> Beholder BeholdTV 505 RDS [0000:505B]
161160 -> Beholder BeholdTV 507 RDS [0000:5071]
162161 -> Beholder BeholdTV 507 RDS [0000:507B]
163162 -> Beholder BeholdTV 607 FM [5ace:6071]
164163 -> Beholder BeholdTV 609 FM [5ace:6090]
165164 -> Beholder BeholdTV 609 FM [5ace:6091]
166165 -> Beholder BeholdTV 607 RDS [5ace:6072]
167166 -> Beholder BeholdTV 607 RDS [5ace:6073]
168167 -> Beholder BeholdTV 609 RDS [5ace:6092]
169168 -> Beholder BeholdTV 609 RDS [5ace:6093]
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index e1c455827b8d..40e620284f56 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -4039,7 +4039,7 @@ struct saa7134_board saa7134_boards[] = {
4039 [SAA7134_BOARD_BEHOLD_505FM] = { 4039 [SAA7134_BOARD_BEHOLD_505FM] = {
4040 /* Beholder Intl. Ltd. 2008 */ 4040 /* Beholder Intl. Ltd. 2008 */
4041 /*Dmitry Belimov <d.belimov@gmail.com> */ 4041 /*Dmitry Belimov <d.belimov@gmail.com> */
4042 .name = "Beholder BeholdTV 505 FM/RDS", 4042 .name = "Beholder BeholdTV 505 FM",
4043 .audio_clock = 0x00200000, 4043 .audio_clock = 0x00200000,
4044 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, 4044 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
4045 .radio_type = UNSET, 4045 .radio_type = UNSET,
@@ -4052,6 +4052,40 @@ struct saa7134_board saa7134_boards[] = {
4052 .vmux = 3, 4052 .vmux = 3,
4053 .amux = LINE2, 4053 .amux = LINE2,
4054 .tv = 1, 4054 .tv = 1,
4055 }, {
4056 .name = name_comp1,
4057 .vmux = 1,
4058 .amux = LINE1,
4059 }, {
4060 .name = name_svideo,
4061 .vmux = 8,
4062 .amux = LINE1,
4063 } },
4064 .mute = {
4065 .name = name_mute,
4066 .amux = LINE1,
4067 },
4068 .radio = {
4069 .name = name_radio,
4070 .amux = LINE2,
4071 },
4072 },
4073 [SAA7134_BOARD_BEHOLD_505RDS] = {
4074 /* Beholder Intl. Ltd. 2008 */
4075 /*Dmitry Belimov <d.belimov@gmail.com> */
4076 .name = "Beholder BeholdTV 505 RDS",
4077 .audio_clock = 0x00200000,
4078 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
4079 .radio_type = UNSET,
4080 .tuner_addr = ADDR_UNSET,
4081 .radio_addr = ADDR_UNSET,
4082 .tda9887_conf = TDA9887_PRESENT,
4083 .gpiomask = 0x00008000,
4084 .inputs = {{
4085 .name = name_tv,
4086 .vmux = 3,
4087 .amux = LINE2,
4088 .tv = 1,
4055 },{ 4089 },{
4056 .name = name_comp1, 4090 .name = name_comp1,
4057 .vmux = 1, 4091 .vmux = 1,
@@ -4073,7 +4107,7 @@ struct saa7134_board saa7134_boards[] = {
4073 [SAA7134_BOARD_BEHOLD_507_9FM] = { 4107 [SAA7134_BOARD_BEHOLD_507_9FM] = {
4074 /* Beholder Intl. Ltd. 2008 */ 4108 /* Beholder Intl. Ltd. 2008 */
4075 /*Dmitry Belimov <d.belimov@gmail.com> */ 4109 /*Dmitry Belimov <d.belimov@gmail.com> */
4076 .name = "Beholder BeholdTV 507 FM/RDS / BeholdTV 509 FM", 4110 .name = "Beholder BeholdTV 507 FM / BeholdTV 509 FM",
4077 .audio_clock = 0x00187de7, 4111 .audio_clock = 0x00187de7,
4078 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, 4112 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
4079 .radio_type = UNSET, 4113 .radio_type = UNSET,
@@ -4100,6 +4134,66 @@ struct saa7134_board saa7134_boards[] = {
4100 .amux = LINE2, 4134 .amux = LINE2,
4101 }, 4135 },
4102 }, 4136 },
4137 [SAA7134_BOARD_BEHOLD_507RDS_MK5] = {
4138 /* Beholder Intl. Ltd. 2008 */
4139 /*Dmitry Belimov <d.belimov@gmail.com> */
4140 .name = "Beholder BeholdTV 507 RDS",
4141 .audio_clock = 0x00187de7,
4142 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
4143 .radio_type = UNSET,
4144 .tuner_addr = ADDR_UNSET,
4145 .radio_addr = ADDR_UNSET,
4146 .tda9887_conf = TDA9887_PRESENT,
4147 .gpiomask = 0x00008000,
4148 .inputs = {{
4149 .name = name_tv,
4150 .vmux = 3,
4151 .amux = TV,
4152 .tv = 1,
4153 }, {
4154 .name = name_comp1,
4155 .vmux = 1,
4156 .amux = LINE1,
4157 }, {
4158 .name = name_svideo,
4159 .vmux = 8,
4160 .amux = LINE1,
4161 } },
4162 .radio = {
4163 .name = name_radio,
4164 .amux = LINE2,
4165 },
4166 },
4167 [SAA7134_BOARD_BEHOLD_507RDS_MK3] = {
4168 /* Beholder Intl. Ltd. 2008 */
4169 /*Dmitry Belimov <d.belimov@gmail.com> */
4170 .name = "Beholder BeholdTV 507 RDS",
4171 .audio_clock = 0x00187de7,
4172 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
4173 .radio_type = UNSET,
4174 .tuner_addr = ADDR_UNSET,
4175 .radio_addr = ADDR_UNSET,
4176 .tda9887_conf = TDA9887_PRESENT,
4177 .gpiomask = 0x00008000,
4178 .inputs = {{
4179 .name = name_tv,
4180 .vmux = 3,
4181 .amux = TV,
4182 .tv = 1,
4183 }, {
4184 .name = name_comp1,
4185 .vmux = 1,
4186 .amux = LINE1,
4187 }, {
4188 .name = name_svideo,
4189 .vmux = 8,
4190 .amux = LINE1,
4191 } },
4192 .radio = {
4193 .name = name_radio,
4194 .amux = LINE2,
4195 },
4196 },
4103 [SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM] = { 4197 [SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM] = {
4104 /* Beholder Intl. Ltd. 2008 */ 4198 /* Beholder Intl. Ltd. 2008 */
4105 /*Dmitry Belimov <d.belimov@gmail.com> */ 4199 /*Dmitry Belimov <d.belimov@gmail.com> */
@@ -4134,9 +4228,37 @@ struct saa7134_board saa7134_boards[] = {
4134 .gpio = 0x000A8000, 4228 .gpio = 0x000A8000,
4135 }, 4229 },
4136 }, 4230 },
4137 [SAA7134_BOARD_BEHOLD_607_9FM] = { 4231 [SAA7134_BOARD_BEHOLD_607FM_MK3] = {
4232 /* Andrey Melnikoff <temnota@kmv.ru> */
4233 .name = "Beholder BeholdTV 607 FM",
4234 .audio_clock = 0x00187de7,
4235 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
4236 .radio_type = UNSET,
4237 .tuner_addr = ADDR_UNSET,
4238 .radio_addr = ADDR_UNSET,
4239 .tda9887_conf = TDA9887_PRESENT,
4240 .inputs = {{
4241 .name = name_tv,
4242 .vmux = 3,
4243 .amux = TV,
4244 .tv = 1,
4245 }, {
4246 .name = name_comp1,
4247 .vmux = 1,
4248 .amux = LINE1,
4249 }, {
4250 .name = name_svideo,
4251 .vmux = 8,
4252 .amux = LINE1,
4253 } },
4254 .radio = {
4255 .name = name_radio,
4256 .amux = LINE2,
4257 },
4258 },
4259 [SAA7134_BOARD_BEHOLD_609FM_MK3] = {
4138 /* Andrey Melnikoff <temnota@kmv.ru> */ 4260 /* Andrey Melnikoff <temnota@kmv.ru> */
4139 .name = "Beholder BeholdTV 607 / BeholdTV 609", 4261 .name = "Beholder BeholdTV 609 FM",
4140 .audio_clock = 0x00187de7, 4262 .audio_clock = 0x00187de7,
4141 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, 4263 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
4142 .radio_type = UNSET, 4264 .radio_type = UNSET,
@@ -4148,6 +4270,174 @@ struct saa7134_board saa7134_boards[] = {
4148 .vmux = 3, 4270 .vmux = 3,
4149 .amux = TV, 4271 .amux = TV,
4150 .tv = 1, 4272 .tv = 1,
4273 }, {
4274 .name = name_comp1,
4275 .vmux = 1,
4276 .amux = LINE1,
4277 }, {
4278 .name = name_svideo,
4279 .vmux = 8,
4280 .amux = LINE1,
4281 } },
4282 .radio = {
4283 .name = name_radio,
4284 .amux = LINE2,
4285 },
4286 },
4287 [SAA7134_BOARD_BEHOLD_607FM_MK5] = {
4288 /* Andrey Melnikoff <temnota@kmv.ru> */
4289 .name = "Beholder BeholdTV 607 FM",
4290 .audio_clock = 0x00187de7,
4291 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
4292 .radio_type = UNSET,
4293 .tuner_addr = ADDR_UNSET,
4294 .radio_addr = ADDR_UNSET,
4295 .tda9887_conf = TDA9887_PRESENT,
4296 .inputs = {{
4297 .name = name_tv,
4298 .vmux = 3,
4299 .amux = TV,
4300 .tv = 1,
4301 }, {
4302 .name = name_comp1,
4303 .vmux = 1,
4304 .amux = LINE1,
4305 }, {
4306 .name = name_svideo,
4307 .vmux = 8,
4308 .amux = LINE1,
4309 } },
4310 .radio = {
4311 .name = name_radio,
4312 .amux = LINE2,
4313 },
4314 },
4315 [SAA7134_BOARD_BEHOLD_609FM_MK5] = {
4316 /* Andrey Melnikoff <temnota@kmv.ru> */
4317 .name = "Beholder BeholdTV 609 FM",
4318 .audio_clock = 0x00187de7,
4319 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
4320 .radio_type = UNSET,
4321 .tuner_addr = ADDR_UNSET,
4322 .radio_addr = ADDR_UNSET,
4323 .tda9887_conf = TDA9887_PRESENT,
4324 .inputs = {{
4325 .name = name_tv,
4326 .vmux = 3,
4327 .amux = TV,
4328 .tv = 1,
4329 }, {
4330 .name = name_comp1,
4331 .vmux = 1,
4332 .amux = LINE1,
4333 }, {
4334 .name = name_svideo,
4335 .vmux = 8,
4336 .amux = LINE1,
4337 } },
4338 .radio = {
4339 .name = name_radio,
4340 .amux = LINE2,
4341 },
4342 },
4343 [SAA7134_BOARD_BEHOLD_607RDS_MK3] = {
4344 /* Andrey Melnikoff <temnota@kmv.ru> */
4345 .name = "Beholder BeholdTV 607 RDS",
4346 .audio_clock = 0x00187de7,
4347 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
4348 .radio_type = UNSET,
4349 .tuner_addr = ADDR_UNSET,
4350 .radio_addr = ADDR_UNSET,
4351 .tda9887_conf = TDA9887_PRESENT,
4352 .inputs = {{
4353 .name = name_tv,
4354 .vmux = 3,
4355 .amux = TV,
4356 .tv = 1,
4357 }, {
4358 .name = name_comp1,
4359 .vmux = 1,
4360 .amux = LINE1,
4361 }, {
4362 .name = name_svideo,
4363 .vmux = 8,
4364 .amux = LINE1,
4365 } },
4366 .radio = {
4367 .name = name_radio,
4368 .amux = LINE2,
4369 },
4370 },
4371 [SAA7134_BOARD_BEHOLD_609RDS_MK3] = {
4372 /* Andrey Melnikoff <temnota@kmv.ru> */
4373 .name = "Beholder BeholdTV 609 RDS",
4374 .audio_clock = 0x00187de7,
4375 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
4376 .radio_type = UNSET,
4377 .tuner_addr = ADDR_UNSET,
4378 .radio_addr = ADDR_UNSET,
4379 .tda9887_conf = TDA9887_PRESENT,
4380 .inputs = {{
4381 .name = name_tv,
4382 .vmux = 3,
4383 .amux = TV,
4384 .tv = 1,
4385 }, {
4386 .name = name_comp1,
4387 .vmux = 1,
4388 .amux = LINE1,
4389 }, {
4390 .name = name_svideo,
4391 .vmux = 8,
4392 .amux = LINE1,
4393 } },
4394 .radio = {
4395 .name = name_radio,
4396 .amux = LINE2,
4397 },
4398 },
4399 [SAA7134_BOARD_BEHOLD_607RDS_MK5] = {
4400 /* Andrey Melnikoff <temnota@kmv.ru> */
4401 .name = "Beholder BeholdTV 607 RDS",
4402 .audio_clock = 0x00187de7,
4403 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
4404 .radio_type = UNSET,
4405 .tuner_addr = ADDR_UNSET,
4406 .radio_addr = ADDR_UNSET,
4407 .tda9887_conf = TDA9887_PRESENT,
4408 .inputs = {{
4409 .name = name_tv,
4410 .vmux = 3,
4411 .amux = TV,
4412 .tv = 1,
4413 }, {
4414 .name = name_comp1,
4415 .vmux = 1,
4416 .amux = LINE1,
4417 }, {
4418 .name = name_svideo,
4419 .vmux = 8,
4420 .amux = LINE1,
4421 } },
4422 .radio = {
4423 .name = name_radio,
4424 .amux = LINE2,
4425 },
4426 },
4427 [SAA7134_BOARD_BEHOLD_609RDS_MK5] = {
4428 /* Andrey Melnikoff <temnota@kmv.ru> */
4429 .name = "Beholder BeholdTV 609 RDS",
4430 .audio_clock = 0x00187de7,
4431 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
4432 .radio_type = UNSET,
4433 .tuner_addr = ADDR_UNSET,
4434 .radio_addr = ADDR_UNSET,
4435 .tda9887_conf = TDA9887_PRESENT,
4436 .inputs = {{
4437 .name = name_tv,
4438 .vmux = 3,
4439 .amux = TV,
4440 .tv = 1,
4151 },{ 4441 },{
4152 .name = name_comp1, 4442 .name = name_comp1,
4153 .vmux = 1, 4443 .vmux = 1,
@@ -4242,8 +4532,7 @@ struct saa7134_board saa7134_boards[] = {
4242 /* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */ 4532 /* Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> */
4243 .name = "Beholder BeholdTV M6 Extra", 4533 .name = "Beholder BeholdTV M6 Extra",
4244 .audio_clock = 0x00187de7, 4534 .audio_clock = 0x00187de7,
4245 /* FIXME: Must be PHILIPS_FM1216ME_MK5*/ 4535 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */
4246 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
4247 .radio_type = UNSET, 4536 .radio_type = UNSET,
4248 .tuner_addr = ADDR_UNSET, 4537 .tuner_addr = ADDR_UNSET,
4249 .radio_addr = ADDR_UNSET, 4538 .radio_addr = ADDR_UNSET,
@@ -5731,14 +6020,8 @@ struct pci_device_id saa7134_pci_tbl[] = {
5731 .vendor = PCI_VENDOR_ID_PHILIPS, 6020 .vendor = PCI_VENDOR_ID_PHILIPS,
5732 .device = PCI_DEVICE_ID_PHILIPS_SAA7130, 6021 .device = PCI_DEVICE_ID_PHILIPS_SAA7130,
5733 .subvendor = 0x0000, 6022 .subvendor = 0x0000,
5734 .subdevice = 0x5051,
5735 .driver_data = SAA7134_BOARD_BEHOLD_505FM,
5736 },{
5737 .vendor = PCI_VENDOR_ID_PHILIPS,
5738 .device = PCI_DEVICE_ID_PHILIPS_SAA7130,
5739 .subvendor = 0x0000,
5740 .subdevice = 0x505B, 6023 .subdevice = 0x505B,
5741 .driver_data = SAA7134_BOARD_BEHOLD_505FM, 6024 .driver_data = SAA7134_BOARD_BEHOLD_505RDS,
5742 },{ 6025 },{
5743 .vendor = PCI_VENDOR_ID_PHILIPS, 6026 .vendor = PCI_VENDOR_ID_PHILIPS,
5744 .device = PCI_DEVICE_ID_PHILIPS_SAA7130, 6027 .device = PCI_DEVICE_ID_PHILIPS_SAA7130,
@@ -5750,13 +6033,13 @@ struct pci_device_id saa7134_pci_tbl[] = {
5750 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 6033 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
5751 .subvendor = 0x0000, 6034 .subvendor = 0x0000,
5752 .subdevice = 0x5071, 6035 .subdevice = 0x5071,
5753 .driver_data = SAA7134_BOARD_BEHOLD_507_9FM, 6036 .driver_data = SAA7134_BOARD_BEHOLD_507RDS_MK3,
5754 },{ 6037 },{
5755 .vendor = PCI_VENDOR_ID_PHILIPS, 6038 .vendor = PCI_VENDOR_ID_PHILIPS,
5756 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 6039 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
5757 .subvendor = 0x0000, 6040 .subvendor = 0x0000,
5758 .subdevice = 0x507B, 6041 .subdevice = 0x507B,
5759 .driver_data = SAA7134_BOARD_BEHOLD_507_9FM, 6042 .driver_data = SAA7134_BOARD_BEHOLD_507RDS_MK5,
5760 },{ 6043 },{
5761 .vendor = PCI_VENDOR_ID_PHILIPS, 6044 .vendor = PCI_VENDOR_ID_PHILIPS,
5762 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 6045 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -5780,49 +6063,49 @@ struct pci_device_id saa7134_pci_tbl[] = {
5780 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 6063 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
5781 .subvendor = 0x5ace, 6064 .subvendor = 0x5ace,
5782 .subdevice = 0x6070, 6065 .subdevice = 0x6070,
5783 .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, 6066 .driver_data = SAA7134_BOARD_BEHOLD_607FM_MK3,
5784 },{ 6067 },{
5785 .vendor = PCI_VENDOR_ID_PHILIPS, 6068 .vendor = PCI_VENDOR_ID_PHILIPS,
5786 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 6069 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
5787 .subvendor = 0x5ace, 6070 .subvendor = 0x5ace,
5788 .subdevice = 0x6071, 6071 .subdevice = 0x6071,
5789 .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, 6072 .driver_data = SAA7134_BOARD_BEHOLD_607FM_MK5,
5790 },{ 6073 },{
5791 .vendor = PCI_VENDOR_ID_PHILIPS, 6074 .vendor = PCI_VENDOR_ID_PHILIPS,
5792 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 6075 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
5793 .subvendor = 0x5ace, 6076 .subvendor = 0x5ace,
5794 .subdevice = 0x6072, 6077 .subdevice = 0x6072,
5795 .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, 6078 .driver_data = SAA7134_BOARD_BEHOLD_607RDS_MK3,
5796 },{ 6079 },{
5797 .vendor = PCI_VENDOR_ID_PHILIPS, 6080 .vendor = PCI_VENDOR_ID_PHILIPS,
5798 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 6081 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
5799 .subvendor = 0x5ace, 6082 .subvendor = 0x5ace,
5800 .subdevice = 0x6073, 6083 .subdevice = 0x6073,
5801 .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, 6084 .driver_data = SAA7134_BOARD_BEHOLD_607RDS_MK5,
5802 },{ 6085 },{
5803 .vendor = PCI_VENDOR_ID_PHILIPS, 6086 .vendor = PCI_VENDOR_ID_PHILIPS,
5804 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 6087 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
5805 .subvendor = 0x5ace, 6088 .subvendor = 0x5ace,
5806 .subdevice = 0x6090, 6089 .subdevice = 0x6090,
5807 .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, 6090 .driver_data = SAA7134_BOARD_BEHOLD_609FM_MK3,
5808 },{ 6091 },{
5809 .vendor = PCI_VENDOR_ID_PHILIPS, 6092 .vendor = PCI_VENDOR_ID_PHILIPS,
5810 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 6093 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
5811 .subvendor = 0x5ace, 6094 .subvendor = 0x5ace,
5812 .subdevice = 0x6091, 6095 .subdevice = 0x6091,
5813 .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, 6096 .driver_data = SAA7134_BOARD_BEHOLD_609FM_MK5,
5814 },{ 6097 },{
5815 .vendor = PCI_VENDOR_ID_PHILIPS, 6098 .vendor = PCI_VENDOR_ID_PHILIPS,
5816 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 6099 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
5817 .subvendor = 0x5ace, 6100 .subvendor = 0x5ace,
5818 .subdevice = 0x6092, 6101 .subdevice = 0x6092,
5819 .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, 6102 .driver_data = SAA7134_BOARD_BEHOLD_609RDS_MK3,
5820 },{ 6103 },{
5821 .vendor = PCI_VENDOR_ID_PHILIPS, 6104 .vendor = PCI_VENDOR_ID_PHILIPS,
5822 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 6105 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
5823 .subvendor = 0x5ace, 6106 .subvendor = 0x5ace,
5824 .subdevice = 0x6093, 6107 .subdevice = 0x6093,
5825 .driver_data = SAA7134_BOARD_BEHOLD_607_9FM, 6108 .driver_data = SAA7134_BOARD_BEHOLD_609RDS_MK5,
5826 },{ 6109 },{
5827 .vendor = PCI_VENDOR_ID_PHILIPS, 6110 .vendor = PCI_VENDOR_ID_PHILIPS,
5828 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 6111 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
@@ -6226,7 +6509,10 @@ int saa7134_board_init1(struct saa7134_dev *dev)
6226 case SAA7134_BOARD_BEHOLD_407FM: 6509 case SAA7134_BOARD_BEHOLD_407FM:
6227 case SAA7134_BOARD_BEHOLD_409: 6510 case SAA7134_BOARD_BEHOLD_409:
6228 case SAA7134_BOARD_BEHOLD_505FM: 6511 case SAA7134_BOARD_BEHOLD_505FM:
6512 case SAA7134_BOARD_BEHOLD_505RDS:
6229 case SAA7134_BOARD_BEHOLD_507_9FM: 6513 case SAA7134_BOARD_BEHOLD_507_9FM:
6514 case SAA7134_BOARD_BEHOLD_507RDS_MK3:
6515 case SAA7134_BOARD_BEHOLD_507RDS_MK5:
6230 case SAA7134_BOARD_GENIUS_TVGO_A11MCE: 6516 case SAA7134_BOARD_GENIUS_TVGO_A11MCE:
6231 case SAA7134_BOARD_REAL_ANGEL_220: 6517 case SAA7134_BOARD_REAL_ANGEL_220:
6232 case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG: 6518 case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG:
@@ -6347,7 +6633,14 @@ int saa7134_board_init1(struct saa7134_dev *dev)
6347 case SAA7134_BOARD_UPMOST_PURPLE_TV: 6633 case SAA7134_BOARD_UPMOST_PURPLE_TV:
6348 case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS: 6634 case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:
6349 case SAA7134_BOARD_HAUPPAUGE_HVR1110: 6635 case SAA7134_BOARD_HAUPPAUGE_HVR1110:
6350 case SAA7134_BOARD_BEHOLD_607_9FM: 6636 case SAA7134_BOARD_BEHOLD_607FM_MK3:
6637 case SAA7134_BOARD_BEHOLD_607FM_MK5:
6638 case SAA7134_BOARD_BEHOLD_609FM_MK3:
6639 case SAA7134_BOARD_BEHOLD_609FM_MK5:
6640 case SAA7134_BOARD_BEHOLD_607RDS_MK3:
6641 case SAA7134_BOARD_BEHOLD_607RDS_MK5:
6642 case SAA7134_BOARD_BEHOLD_609RDS_MK3:
6643 case SAA7134_BOARD_BEHOLD_609RDS_MK5:
6351 case SAA7134_BOARD_BEHOLD_M6: 6644 case SAA7134_BOARD_BEHOLD_M6:
6352 case SAA7134_BOARD_BEHOLD_M63: 6645 case SAA7134_BOARD_BEHOLD_M63:
6353 case SAA7134_BOARD_BEHOLD_M6_EXTRA: 6646 case SAA7134_BOARD_BEHOLD_M6_EXTRA:
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 25217ae6606c..450637517265 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -507,7 +507,10 @@ int saa7134_input_init1(struct saa7134_dev *dev)
507 case SAA7134_BOARD_BEHOLD_407FM: 507 case SAA7134_BOARD_BEHOLD_407FM:
508 case SAA7134_BOARD_BEHOLD_409: 508 case SAA7134_BOARD_BEHOLD_409:
509 case SAA7134_BOARD_BEHOLD_505FM: 509 case SAA7134_BOARD_BEHOLD_505FM:
510 case SAA7134_BOARD_BEHOLD_505RDS:
510 case SAA7134_BOARD_BEHOLD_507_9FM: 511 case SAA7134_BOARD_BEHOLD_507_9FM:
512 case SAA7134_BOARD_BEHOLD_507RDS_MK3:
513 case SAA7134_BOARD_BEHOLD_507RDS_MK5:
511 ir_codes = ir_codes_manli; 514 ir_codes = ir_codes_manli;
512 mask_keycode = 0x003f00; 515 mask_keycode = 0x003f00;
513 mask_keyup = 0x004000; 516 mask_keyup = 0x004000;
@@ -714,7 +717,14 @@ void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir)
714 ir->get_key = get_key_hvr1110; 717 ir->get_key = get_key_hvr1110;
715 ir->ir_codes = ir_codes_hauppauge_new; 718 ir->ir_codes = ir_codes_hauppauge_new;
716 break; 719 break;
717 case SAA7134_BOARD_BEHOLD_607_9FM: 720 case SAA7134_BOARD_BEHOLD_607FM_MK3:
721 case SAA7134_BOARD_BEHOLD_607FM_MK5:
722 case SAA7134_BOARD_BEHOLD_609FM_MK3:
723 case SAA7134_BOARD_BEHOLD_609FM_MK5:
724 case SAA7134_BOARD_BEHOLD_607RDS_MK3:
725 case SAA7134_BOARD_BEHOLD_607RDS_MK5:
726 case SAA7134_BOARD_BEHOLD_609RDS_MK3:
727 case SAA7134_BOARD_BEHOLD_609RDS_MK5:
718 case SAA7134_BOARD_BEHOLD_M6: 728 case SAA7134_BOARD_BEHOLD_M6:
719 case SAA7134_BOARD_BEHOLD_M63: 729 case SAA7134_BOARD_BEHOLD_M63:
720 case SAA7134_BOARD_BEHOLD_M6_EXTRA: 730 case SAA7134_BOARD_BEHOLD_M6_EXTRA:
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index a8ac046b6ebe..1d190e5e1ac4 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -252,7 +252,7 @@ struct saa7134_format {
252#define SAA7134_BOARD_BEHOLD_505FM 126 252#define SAA7134_BOARD_BEHOLD_505FM 126
253#define SAA7134_BOARD_BEHOLD_507_9FM 127 253#define SAA7134_BOARD_BEHOLD_507_9FM 127
254#define SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM 128 254#define SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM 128
255#define SAA7134_BOARD_BEHOLD_607_9FM 129 255#define SAA7134_BOARD_BEHOLD_607FM_MK3 129
256#define SAA7134_BOARD_BEHOLD_M6 130 256#define SAA7134_BOARD_BEHOLD_M6 130
257#define SAA7134_BOARD_TWINHAN_DTV_DVB_3056 131 257#define SAA7134_BOARD_TWINHAN_DTV_DVB_3056 131
258#define SAA7134_BOARD_GENIUS_TVGO_A11MCE 132 258#define SAA7134_BOARD_GENIUS_TVGO_A11MCE 132
@@ -282,6 +282,16 @@ struct saa7134_format {
282#define SAA7134_BOARD_HAUPPAUGE_HVR1110R3 156 282#define SAA7134_BOARD_HAUPPAUGE_HVR1110R3 156
283#define SAA7134_BOARD_AVERMEDIA_STUDIO_507UA 157 283#define SAA7134_BOARD_AVERMEDIA_STUDIO_507UA 157
284#define SAA7134_BOARD_AVERMEDIA_CARDBUS_501 158 284#define SAA7134_BOARD_AVERMEDIA_CARDBUS_501 158
285#define SAA7134_BOARD_BEHOLD_505RDS 159
286#define SAA7134_BOARD_BEHOLD_507RDS_MK3 160
287#define SAA7134_BOARD_BEHOLD_507RDS_MK5 161
288#define SAA7134_BOARD_BEHOLD_607FM_MK5 162
289#define SAA7134_BOARD_BEHOLD_609FM_MK3 163
290#define SAA7134_BOARD_BEHOLD_609FM_MK5 164
291#define SAA7134_BOARD_BEHOLD_607RDS_MK3 165
292#define SAA7134_BOARD_BEHOLD_607RDS_MK5 166
293#define SAA7134_BOARD_BEHOLD_609RDS_MK3 167
294#define SAA7134_BOARD_BEHOLD_609RDS_MK5 168
285 295
286#define SAA7134_MAXBOARDS 32 296#define SAA7134_MAXBOARDS 32
287#define SAA7134_INPUT_MAX 8 297#define SAA7134_INPUT_MAX 8
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-20 06:05:53 -0500