diff options
-rw-r--r-- | Documentation/video4linux/CARDLIST.saa7134 | 1 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 57 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-input.c | 1 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 1 |
4 files changed, 60 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134 index cd0222d845d..0ac4d254477 100644 --- a/Documentation/video4linux/CARDLIST.saa7134 +++ b/Documentation/video4linux/CARDLIST.saa7134 | |||
@@ -170,3 +170,4 @@ | |||
170 | 169 -> Compro VideoMate S350/S300 [185b:c900] | 170 | 169 -> Compro VideoMate S350/S300 [185b:c900] |
171 | 170 -> AverMedia AverTV Studio 505 [1461:a115] | 171 | 170 -> AverMedia AverTV Studio 505 [1461:a115] |
172 | 171 -> Beholder BeholdTV X7 [5ace:7595] | 172 | 171 -> Beholder BeholdTV X7 [5ace:7595] |
173 | 172 -> RoverMedia TV Link Pro FM [19d1:0138] | ||
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index a433a9b7f1e..1b29487fd25 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -266,6 +266,56 @@ struct saa7134_board saa7134_boards[] = { | |||
266 | .gpio = 0x10000, | 266 | .gpio = 0x10000, |
267 | }, | 267 | }, |
268 | }, | 268 | }, |
269 | [SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM] = { | ||
270 | /* RoverMedia TV Link Pro FM (LR138 REV:I) */ | ||
271 | /* Eugene Yudin <Eugene.Yudin@gmail.com> */ | ||
272 | .name = "RoverMedia TV Link Pro FM", | ||
273 | .audio_clock = 0x00200000, | ||
274 | .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, /* TCL MFPE05 2 */ | ||
275 | .radio_type = UNSET, | ||
276 | .tuner_addr = ADDR_UNSET, | ||
277 | .radio_addr = ADDR_UNSET, | ||
278 | .tda9887_conf = TDA9887_PRESENT, | ||
279 | .gpiomask = 0xe000, | ||
280 | .inputs = { { | ||
281 | .name = name_tv, | ||
282 | .vmux = 1, | ||
283 | .amux = TV, | ||
284 | .gpio = 0x8000, | ||
285 | .tv = 1, | ||
286 | }, { | ||
287 | .name = name_tv_mono, | ||
288 | .vmux = 1, | ||
289 | .amux = LINE2, | ||
290 | .gpio = 0x0000, | ||
291 | .tv = 1, | ||
292 | }, { | ||
293 | .name = name_comp1, | ||
294 | .vmux = 0, | ||
295 | .amux = LINE2, | ||
296 | .gpio = 0x4000, | ||
297 | }, { | ||
298 | .name = name_comp2, | ||
299 | .vmux = 3, | ||
300 | .amux = LINE2, | ||
301 | .gpio = 0x4000, | ||
302 | }, { | ||
303 | .name = name_svideo, | ||
304 | .vmux = 8, | ||
305 | .amux = LINE2, | ||
306 | .gpio = 0x4000, | ||
307 | } }, | ||
308 | .radio = { | ||
309 | .name = name_radio, | ||
310 | .amux = LINE2, | ||
311 | .gpio = 0x2000, | ||
312 | }, | ||
313 | .mute = { | ||
314 | .name = name_mute, | ||
315 | .amux = TV, | ||
316 | .gpio = 0x8000, | ||
317 | }, | ||
318 | }, | ||
269 | [SAA7134_BOARD_EMPRESS] = { | 319 | [SAA7134_BOARD_EMPRESS] = { |
270 | /* "Gert Vervoort" <gert.vervoort@philips.com> */ | 320 | /* "Gert Vervoort" <gert.vervoort@philips.com> */ |
271 | .name = "EMPRESS", | 321 | .name = "EMPRESS", |
@@ -6334,6 +6384,12 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
6334 | .subdevice = 0x7595, | 6384 | .subdevice = 0x7595, |
6335 | .driver_data = SAA7134_BOARD_BEHOLD_X7, | 6385 | .driver_data = SAA7134_BOARD_BEHOLD_X7, |
6336 | }, { | 6386 | }, { |
6387 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
6388 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | ||
6389 | .subvendor = 0x19d1, /* RoverMedia */ | ||
6390 | .subdevice = 0x0138, /* LifeView FlyTV Prime30 OEM */ | ||
6391 | .driver_data = SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM, | ||
6392 | }, { | ||
6337 | /* --- boards without eeprom + subsystem ID --- */ | 6393 | /* --- boards without eeprom + subsystem ID --- */ |
6338 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6394 | .vendor = PCI_VENDOR_ID_PHILIPS, |
6339 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 6395 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
@@ -6663,6 +6719,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) | |||
6663 | case SAA7134_BOARD_REAL_ANGEL_220: | 6719 | case SAA7134_BOARD_REAL_ANGEL_220: |
6664 | case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG: | 6720 | case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG: |
6665 | case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS: | 6721 | case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS: |
6722 | case SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM: | ||
6666 | dev->has_remote = SAA7134_REMOTE_GPIO; | 6723 | dev->has_remote = SAA7134_REMOTE_GPIO; |
6667 | break; | 6724 | break; |
6668 | case SAA7134_BOARD_FLYDVBS_LR300: | 6725 | case SAA7134_BOARD_FLYDVBS_LR300: |
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index 355fd247c4b..65fb7b17b67 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c | |||
@@ -415,6 +415,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) | |||
415 | case SAA7134_BOARD_FLYVIDEO3000: | 415 | case SAA7134_BOARD_FLYVIDEO3000: |
416 | case SAA7134_BOARD_FLYTVPLATINUM_FM: | 416 | case SAA7134_BOARD_FLYTVPLATINUM_FM: |
417 | case SAA7134_BOARD_FLYTVPLATINUM_MINI2: | 417 | case SAA7134_BOARD_FLYTVPLATINUM_MINI2: |
418 | case SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM: | ||
418 | ir_codes = ir_codes_flyvideo; | 419 | ir_codes = ir_codes_flyvideo; |
419 | mask_keycode = 0xEC00000; | 420 | mask_keycode = 0xEC00000; |
420 | mask_keydown = 0x0040000; | 421 | mask_keydown = 0x0040000; |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index caefbf07d6f..ac74903a5bd 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -295,6 +295,7 @@ struct saa7134_format { | |||
295 | #define SAA7134_BOARD_VIDEOMATE_S350 169 | 295 | #define SAA7134_BOARD_VIDEOMATE_S350 169 |
296 | #define SAA7134_BOARD_AVERMEDIA_STUDIO_505 170 | 296 | #define SAA7134_BOARD_AVERMEDIA_STUDIO_505 170 |
297 | #define SAA7134_BOARD_BEHOLD_X7 171 | 297 | #define SAA7134_BOARD_BEHOLD_X7 171 |
298 | #define SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM 172 | ||
298 | 299 | ||
299 | #define SAA7134_MAXBOARDS 32 | 300 | #define SAA7134_MAXBOARDS 32 |
300 | #define SAA7134_INPUT_MAX 8 | 301 | #define SAA7134_INPUT_MAX 8 |