В сообщении от Четверг 27 августа 2009 21:04:59 автор Eugene Yudin написал: > Hello. > This patch add support for RoverMedia TV Link Pro FM card based on saa7134. >... Sorry, I forgot some things. All is working now. This patch add support for RoverMedia TV Link Pro FM card based on saa7134. Signed-off-by: Eugene Yudin <Eugene.Yudin@xxxxxxxxx> Best Regards, Eugene. diff -uprN a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 2009-08-26 12:07:09.000000000 +0400 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 2009-08-27 20:59:24.946147754 +0400 @@ -168,3 +168,4 @@ 167 -> Beholder BeholdTV 609 RDS [5ace:6092] 168 -> Beholder BeholdTV 609 RDS [5ace:6093] 169 -> Compro VideoMate S350/S300 [185b:c900] +170 -> RoverMedia TV Link Pro FM [19d1:0138] diff -uprN a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c --- a/linux/drivers/media/video/saa7134/saa7134-cards.c 2009-08-27 20:27:10.000000000 +0400 +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c 2009-08-28 00:57:15.190205787 +0400 @@ -5182,6 +5182,56 @@ struct saa7134_board saa7134_boards[] = .amux = LINE1 } }, }, + [SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM] = { + /* Eugene Yudin <Eugene.Yudin@xxxxxxxxx> */ + .name = "RoverMedia TV Link Pro FM", + .audio_clock = 0x00200000, + .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .tda9887_conf = TDA9887_PRESENT, + + .gpiomask = 0xe000, + .inputs = {{ + .name = name_tv, + .vmux = 1, + .amux = TV, + .gpio = 0x8000, + .tv = 1, + },{ + .name = name_tv_mono, + .vmux = 1, + .amux = LINE2, + .gpio = 0x0000, + .tv = 1, + },{ + .name = name_comp1, + .vmux = 0, + .amux = LINE2, + .gpio = 0x4000, + },{ + .name = name_comp2, + .vmux = 3, + .amux = LINE2, + .gpio = 0x4000, + },{ + .name = name_svideo, + .vmux = 8, + .amux = LINE2, + .gpio = 0x4000, + }}, + .radio = { + .name = name_radio, + .amux = LINE2, + .gpio = 0x2000, + }, + .mute = { + .name = name_mute, + .amux = TV, + .gpio = 0x8000, + }, + }, }; const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards); @@ -6296,6 +6346,12 @@ struct pci_device_id saa7134_pci_tbl[] = .subdevice = 0xc900, .driver_data = SAA7134_BOARD_VIDEOMATE_S350, }, { + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7134, + .subvendor = 0x19d1, /* RoverMedia */ + .subdevice = 0x0138, /* LifeView FlyTV Prime30 OEM */ + .driver_data = SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM, + }, { /* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134, @@ -6656,6 +6712,7 @@ int saa7134_board_init1(struct saa7134_d case SAA7134_BOARD_REAL_ANGEL_220: case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG: case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS: + case SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM: dev->has_remote = SAA7134_REMOTE_GPIO; break; case SAA7134_BOARD_FLYDVBS_LR300: diff -uprN a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c --- a/linux/drivers/media/video/saa7134/saa7134-input.c 2009-08-26 12:07:11.000000000 +0400 +++ b/linux/drivers/media/video/saa7134/saa7134-input.c 2009-08-27 19:49:42.000000000 +0400 @@ -456,6 +456,7 @@ int saa7134_input_init1(struct saa7134_d case SAA7134_BOARD_FLYVIDEO3000: case SAA7134_BOARD_FLYTVPLATINUM_FM: case SAA7134_BOARD_FLYTVPLATINUM_MINI2: + case SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM: ir_codes = ir_codes_flyvideo; mask_keycode = 0xEC00000; mask_keydown = 0x0040000; diff -uprN a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h --- a/linux/drivers/media/video/saa7134/saa7134.h 2009-08-26 12:07:11.000000000 +0400 +++ b/linux/drivers/media/video/saa7134/saa7134.h 2009-08-27 19:50:41.000000000 +0400 @@ -294,6 +294,7 @@ struct saa7134_format { #define SAA7134_BOARD_BEHOLD_609RDS_MK3 167 #define SAA7134_BOARD_BEHOLD_609RDS_MK5 168 #define SAA7134_BOARD_VIDEOMATE_S350 169 +#define SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM 170 #define SAA7134_MAXBOARDS 32 #define SAA7134_INPUT_MAX 8 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html