aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-cards.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-cards.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c53
1 files changed, 40 insertions, 13 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 1b29487fd254..71145bff94fa 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -4164,7 +4164,7 @@ struct saa7134_board saa7134_boards[] = {
4164 /*Dmitry Belimov <d.belimov@gmail.com> */ 4164 /*Dmitry Belimov <d.belimov@gmail.com> */
4165 .name = "Beholder BeholdTV 505 RDS", 4165 .name = "Beholder BeholdTV 505 RDS",
4166 .audio_clock = 0x00200000, 4166 .audio_clock = 0x00200000,
4167 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */ 4167 .tuner_type = TUNER_PHILIPS_FM1216MK5,
4168 .radio_type = UNSET, 4168 .radio_type = UNSET,
4169 .tuner_addr = ADDR_UNSET, 4169 .tuner_addr = ADDR_UNSET,
4170 .radio_addr = ADDR_UNSET, 4170 .radio_addr = ADDR_UNSET,
@@ -4229,7 +4229,7 @@ struct saa7134_board saa7134_boards[] = {
4229 /*Dmitry Belimov <d.belimov@gmail.com> */ 4229 /*Dmitry Belimov <d.belimov@gmail.com> */
4230 .name = "Beholder BeholdTV 507 RDS", 4230 .name = "Beholder BeholdTV 507 RDS",
4231 .audio_clock = 0x00187de7, 4231 .audio_clock = 0x00187de7,
4232 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */ 4232 .tuner_type = TUNER_PHILIPS_FM1216MK5,
4233 .radio_type = UNSET, 4233 .radio_type = UNSET,
4234 .tuner_addr = ADDR_UNSET, 4234 .tuner_addr = ADDR_UNSET,
4235 .radio_addr = ADDR_UNSET, 4235 .radio_addr = ADDR_UNSET,
@@ -4380,7 +4380,7 @@ struct saa7134_board saa7134_boards[] = {
4380 /* Andrey Melnikoff <temnota@kmv.ru> */ 4380 /* Andrey Melnikoff <temnota@kmv.ru> */
4381 .name = "Beholder BeholdTV 607 FM", 4381 .name = "Beholder BeholdTV 607 FM",
4382 .audio_clock = 0x00187de7, 4382 .audio_clock = 0x00187de7,
4383 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */ 4383 .tuner_type = TUNER_PHILIPS_FM1216MK5,
4384 .radio_type = UNSET, 4384 .radio_type = UNSET,
4385 .tuner_addr = ADDR_UNSET, 4385 .tuner_addr = ADDR_UNSET,
4386 .radio_addr = ADDR_UNSET, 4386 .radio_addr = ADDR_UNSET,
@@ -4408,7 +4408,7 @@ struct saa7134_board saa7134_boards[] = {
4408 /* Andrey Melnikoff <temnota@kmv.ru> */ 4408 /* Andrey Melnikoff <temnota@kmv.ru> */
4409 .name = "Beholder BeholdTV 609 FM", 4409 .name = "Beholder BeholdTV 609 FM",
4410 .audio_clock = 0x00187de7, 4410 .audio_clock = 0x00187de7,
4411 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */ 4411 .tuner_type = TUNER_PHILIPS_FM1216MK5,
4412 .radio_type = UNSET, 4412 .radio_type = UNSET,
4413 .tuner_addr = ADDR_UNSET, 4413 .tuner_addr = ADDR_UNSET,
4414 .radio_addr = ADDR_UNSET, 4414 .radio_addr = ADDR_UNSET,
@@ -4494,7 +4494,7 @@ struct saa7134_board saa7134_boards[] = {
4494 /* Andrey Melnikoff <temnota@kmv.ru> */ 4494 /* Andrey Melnikoff <temnota@kmv.ru> */
4495 .name = "Beholder BeholdTV 607 RDS", 4495 .name = "Beholder BeholdTV 607 RDS",
4496 .audio_clock = 0x00187de7, 4496 .audio_clock = 0x00187de7,
4497 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */ 4497 .tuner_type = TUNER_PHILIPS_FM1216MK5,
4498 .radio_type = UNSET, 4498 .radio_type = UNSET,
4499 .tuner_addr = ADDR_UNSET, 4499 .tuner_addr = ADDR_UNSET,
4500 .radio_addr = ADDR_UNSET, 4500 .radio_addr = ADDR_UNSET,
@@ -4523,7 +4523,7 @@ struct saa7134_board saa7134_boards[] = {
4523 /* Andrey Melnikoff <temnota@kmv.ru> */ 4523 /* Andrey Melnikoff <temnota@kmv.ru> */
4524 .name = "Beholder BeholdTV 609 RDS", 4524 .name = "Beholder BeholdTV 609 RDS",
4525 .audio_clock = 0x00187de7, 4525 .audio_clock = 0x00187de7,
4526 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */ 4526 .tuner_type = TUNER_PHILIPS_FM1216MK5,
4527 .radio_type = UNSET, 4527 .radio_type = UNSET,
4528 .tuner_addr = ADDR_UNSET, 4528 .tuner_addr = ADDR_UNSET,
4529 .radio_addr = ADDR_UNSET, 4529 .radio_addr = ADDR_UNSET,
@@ -4630,7 +4630,7 @@ struct saa7134_board saa7134_boards[] = {
4630 /* Alexey Osipov <lion-simba@pridelands.ru> */ 4630 /* Alexey Osipov <lion-simba@pridelands.ru> */
4631 .name = "Beholder BeholdTV M6 Extra", 4631 .name = "Beholder BeholdTV M6 Extra",
4632 .audio_clock = 0x00187de7, 4632 .audio_clock = 0x00187de7,
4633 .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* FIXME to MK5 */ 4633 .tuner_type = TUNER_PHILIPS_FM1216MK5,
4634 .radio_type = UNSET, 4634 .radio_type = UNSET,
4635 .tuner_addr = ADDR_UNSET, 4635 .tuner_addr = ADDR_UNSET,
4636 .radio_addr = ADDR_UNSET, 4636 .radio_addr = ADDR_UNSET,
@@ -5257,6 +5257,27 @@ struct saa7134_board saa7134_boards[] = {
5257 .amux = TV, 5257 .amux = TV,
5258 }, 5258 },
5259 }, 5259 },
5260 [SAA7134_BOARD_ZOLID_HYBRID_PCI] = {
5261 .name = "Zolid Hybrid TV Tuner PCI",
5262 .audio_clock = 0x00187de7,
5263 .tuner_type = TUNER_PHILIPS_TDA8290,
5264 .radio_type = UNSET,
5265 .tuner_addr = ADDR_UNSET,
5266 .radio_addr = ADDR_UNSET,
5267 .tuner_config = 0,
5268 .mpeg = SAA7134_MPEG_DVB,
5269 .ts_type = SAA7134_MPEG_TS_PARALLEL,
5270 .inputs = {{
5271 .name = name_tv,
5272 .vmux = 1,
5273 .amux = TV,
5274 .tv = 1,
5275 } },
5276 .radio = { /* untested */
5277 .name = name_radio,
5278 .amux = TV,
5279 },
5280 },
5260 5281
5261}; 5282};
5262 5283
@@ -6390,6 +6411,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
6390 .subdevice = 0x0138, /* LifeView FlyTV Prime30 OEM */ 6411 .subdevice = 0x0138, /* LifeView FlyTV Prime30 OEM */
6391 .driver_data = SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM, 6412 .driver_data = SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM,
6392 }, { 6413 }, {
6414 .vendor = PCI_VENDOR_ID_PHILIPS,
6415 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
6416 .subvendor = PCI_VENDOR_ID_PHILIPS,
6417 .subdevice = 0x2004,
6418 .driver_data = SAA7134_BOARD_ZOLID_HYBRID_PCI,
6419 }, {
6393 /* --- boards without eeprom + subsystem ID --- */ 6420 /* --- boards without eeprom + subsystem ID --- */
6394 .vendor = PCI_VENDOR_ID_PHILIPS, 6421 .vendor = PCI_VENDOR_ID_PHILIPS,
6395 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 6422 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -7208,22 +7235,22 @@ int saa7134_board_init2(struct saa7134_dev *dev)
7208 if (dev->radio_type != UNSET) 7235 if (dev->radio_type != UNSET)
7209 v4l2_i2c_new_subdev(&dev->v4l2_dev, 7236 v4l2_i2c_new_subdev(&dev->v4l2_dev,
7210 &dev->i2c_adap, "tuner", "tuner", 7237 &dev->i2c_adap, "tuner", "tuner",
7211 dev->radio_addr); 7238 dev->radio_addr, NULL);
7212 if (has_demod) 7239 if (has_demod)
7213 v4l2_i2c_new_probed_subdev(&dev->v4l2_dev, 7240 v4l2_i2c_new_subdev(&dev->v4l2_dev,
7214 &dev->i2c_adap, "tuner", "tuner", 7241 &dev->i2c_adap, "tuner", "tuner",
7215 v4l2_i2c_tuner_addrs(ADDRS_DEMOD)); 7242 0, v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
7216 if (dev->tuner_addr == ADDR_UNSET) { 7243 if (dev->tuner_addr == ADDR_UNSET) {
7217 enum v4l2_i2c_tuner_type type = 7244 enum v4l2_i2c_tuner_type type =
7218 has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV; 7245 has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
7219 7246
7220 v4l2_i2c_new_probed_subdev(&dev->v4l2_dev, 7247 v4l2_i2c_new_subdev(&dev->v4l2_dev,
7221 &dev->i2c_adap, "tuner", "tuner", 7248 &dev->i2c_adap, "tuner", "tuner",
7222 v4l2_i2c_tuner_addrs(type)); 7249 0, v4l2_i2c_tuner_addrs(type));
7223 } else { 7250 } else {
7224 v4l2_i2c_new_subdev(&dev->v4l2_dev, 7251 v4l2_i2c_new_subdev(&dev->v4l2_dev,
7225 &dev->i2c_adap, "tuner", "tuner", 7252 &dev->i2c_adap, "tuner", "tuner",
7226 dev->tuner_addr); 7253 dev->tuner_addr, NULL);
7227 } 7254 }
7228 } 7255 }
7229 7256
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-11 14:32:36 -0500