Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 6a2d802ca01bd83b860145e7497a7a049c354cd7

Authored by Pham Thanh Nam
Committed by Mauro Carvalho Chehab
1 parent 46a60cfef5
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

V4L/DVB (10156): saa7134: Add support for Avermedia AVer TV GO 007 FM Plus 

This patch adds support for Avermedia AVer TV GO 007 FM Plus (M15C) on
saa7134 driver (PCI ID 1461:f31d).

Signed-off-by: Pham Thanh Nam <phamthanhnam.ptn@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 4 changed files with 43 additions and 0 deletions Side-by-side Diff

Documentation/video4linux/CARDLIST.saa7134
Diff comments   View file @ 6a2d802
... ... @@ -152,4 +152,5 @@
152 152 151 -> ADS Tech Instant HDTV [1421:0380]
153 153 152 -> Asus Tiger Rev:1.00 [1043:4857]
154 154 153 -> Kworld Plus TV Analog Lite PCI [17de:7128]
  155 +154 -> Avermedia AVerTV GO 007 FM Plus [1461:f31d]
drivers/media/video/saa7134/saa7134-cards.c
Diff comments   View file @ 6a2d802
... ... @@ -4642,6 +4642,38 @@
4642 4642 .amux = 2,
4643 4643 },
4644 4644 },
  4645 + [SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS] = {
  4646 + .name = "Avermedia AVerTV GO 007 FM Plus",
  4647 + .audio_clock = 0x00187de7,
  4648 + .tuner_type = TUNER_PHILIPS_TDA8290,
  4649 + .radio_type = UNSET,
  4650 + .tuner_addr = ADDR_UNSET,
  4651 + .radio_addr = ADDR_UNSET,
  4652 + .gpiomask = 0x00300003,
  4653 + /* .gpiomask = 0x8c240003, */
  4654 + .inputs = { {
  4655 + .name = name_tv,
  4656 + .vmux = 1,
  4657 + .amux = TV,
  4658 + .tv = 1,
  4659 + .gpio = 0x01,
  4660 + }, {
  4661 + .name = name_svideo,
  4662 + .vmux = 6,
  4663 + .amux = LINE1,
  4664 + .gpio = 0x02,
  4665 + } },
  4666 + .radio = {
  4667 + .name = name_radio,
  4668 + .amux = TV,
  4669 + .gpio = 0x00300001,
  4670 + },
  4671 + .mute = {
  4672 + .name = name_mute,
  4673 + .amux = TV,
  4674 + .gpio = 0x01,
  4675 + },
  4676 + },
4645 4677 };
4646 4678  
4647 4679 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
... ... @@ -5739,6 +5771,13 @@
5739 5771 .subdevice = PCI_ANY_ID,
5740 5772 .driver_data = SAA7134_BOARD_UNKNOWN,
5741 5773 },{
  5774 + .vendor = PCI_VENDOR_ID_PHILIPS,
  5775 + .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
  5776 + .subvendor = 0x1461, /* Avermedia Technologies Inc */
  5777 + .subdevice = 0xf31d,
  5778 + .driver_data = SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS,
  5779 +
  5780 + }, {
5742 5781 /* --- end of list --- */
5743 5782 }
5744 5783 };
... ... @@ -5929,6 +5968,7 @@
5929 5968 case SAA7134_BOARD_GENIUS_TVGO_A11MCE:
5930 5969 case SAA7134_BOARD_REAL_ANGEL_220:
5931 5970 case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG:
  5971 + case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS:
5932 5972 dev->has_remote = SAA7134_REMOTE_GPIO;
5933 5973 break;
5934 5974 case SAA7134_BOARD_FLYDVBS_LR300:
drivers/media/video/saa7134/saa7134-input.c
Diff comments   View file @ 6a2d802
... ... @@ -449,6 +449,7 @@
449 449 case SAA7134_BOARD_AVERMEDIA_STUDIO_507:
450 450 case SAA7134_BOARD_AVERMEDIA_GO_007_FM:
451 451 case SAA7134_BOARD_AVERMEDIA_M102:
  452 + case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS:
452 453 ir_codes = ir_codes_avermedia;
453 454 mask_keycode = 0x0007C8;
454 455 mask_keydown = 0x000010;
drivers/media/video/saa7134/saa7134.h
Diff comments   View file @ 6a2d802
... ... @@ -276,6 +276,7 @@
276 276 #define SAA7134_BOARD_ADS_INSTANT_HDTV_PCI 151
277 277 #define SAA7134_BOARD_ASUSTeK_TIGER 152
278 278 #define SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG 153
  279 +#define SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS 154
279 280  
280 281 #define SAA7134_MAXBOARDS 32
281 282 #define SAA7134_INPUT_MAX 8