aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorDmitri Belimov <d.belimov@gmail.com>2011-05-17 00:21:34 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-05-20 19:58:22 -0400
commit5418f9fcb76b458c4e5ca574663c3c9b3a96dc6d (patch)
treed31c441e8aec67ca6f255ad022446dd84b1b968d /drivers/media
parentca540c8b66874aaf704c64d43d33e39369c428fb (diff)
[media] saa7134 add new TV cards
Add new TV cards of Beholder Company. Just for autodetect. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c70
-rw-r--r--drivers/media/video/saa7134/saa7134.h2
2 files changed, 72 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 71b442c2e382..e2062b240e32 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -5632,6 +5632,64 @@ struct saa7134_board saa7134_boards[] = {
5632 .gpio = 0x00050000, 5632 .gpio = 0x00050000,
5633 }, 5633 },
5634 }, 5634 },
5635 [SAA7134_BOARD_BEHOLD_501] = {
5636 /* Beholder Intl. Ltd. 2010 */
5637 /* Dmitry Belimov <d.belimov@gmail.com> */
5638 .name = "Beholder BeholdTV 501",
5639 .audio_clock = 0x00200000,
5640 .tuner_type = TUNER_ABSENT,
5641 .radio_type = UNSET,
5642 .tuner_addr = ADDR_UNSET,
5643 .radio_addr = ADDR_UNSET,
5644 .gpiomask = 0x00008000,
5645 .inputs = { {
5646 .name = name_tv,
5647 .vmux = 3,
5648 .amux = LINE2,
5649 .tv = 1,
5650 }, {
5651 .name = name_comp1,
5652 .vmux = 1,
5653 .amux = LINE1,
5654 }, {
5655 .name = name_svideo,
5656 .vmux = 8,
5657 .amux = LINE1,
5658 } },
5659 .mute = {
5660 .name = name_mute,
5661 .amux = LINE1,
5662 },
5663 },
5664 [SAA7134_BOARD_BEHOLD_503FM] = {
5665 /* Beholder Intl. Ltd. 2010 */
5666 /* Dmitry Belimov <d.belimov@gmail.com> */
5667 .name = "Beholder BeholdTV 503 FM",
5668 .audio_clock = 0x00200000,
5669 .tuner_type = TUNER_ABSENT,
5670 .radio_type = UNSET,
5671 .tuner_addr = ADDR_UNSET,
5672 .radio_addr = ADDR_UNSET,
5673 .gpiomask = 0x00008000,
5674 .inputs = { {
5675 .name = name_tv,
5676 .vmux = 3,
5677 .amux = LINE2,
5678 .tv = 1,
5679 }, {
5680 .name = name_comp1,
5681 .vmux = 1,
5682 .amux = LINE1,
5683 }, {
5684 .name = name_svideo,
5685 .vmux = 8,
5686 .amux = LINE1,
5687 } },
5688 .mute = {
5689 .name = name_mute,
5690 .amux = LINE1,
5691 },
5692 },
5635 5693
5636}; 5694};
5637 5695
@@ -6838,6 +6896,18 @@ struct pci_device_id saa7134_pci_tbl[] = {
6838 .driver_data = SAA7134_BOARD_VIDEOMATE_M1F, 6896 .driver_data = SAA7134_BOARD_VIDEOMATE_M1F,
6839 }, { 6897 }, {
6840 .vendor = PCI_VENDOR_ID_PHILIPS, 6898 .vendor = PCI_VENDOR_ID_PHILIPS,
6899 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
6900 .subvendor = 0x5ace,
6901 .subdevice = 0x5030,
6902 .driver_data = SAA7134_BOARD_BEHOLD_503FM,
6903 }, {
6904 .vendor = PCI_VENDOR_ID_PHILIPS,
6905 .device = PCI_DEVICE_ID_PHILIPS_SAA7130,
6906 .subvendor = 0x5ace,
6907 .subdevice = 0x5010,
6908 .driver_data = SAA7134_BOARD_BEHOLD_501,
6909 }, {
6910 .vendor = PCI_VENDOR_ID_PHILIPS,
6841 .device = PCI_DEVICE_ID_PHILIPS_SAA7134, 6911 .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
6842 .subvendor = 0x17de, 6912 .subvendor = 0x17de,
6843 .subdevice = 0xd136, 6913 .subdevice = 0xd136,
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 0385d0bd7f7f..28eb10398323 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -329,6 +329,8 @@ struct saa7134_card_ir {
329#define SAA7134_BOARD_VIDEOMATE_M1F 183 329#define SAA7134_BOARD_VIDEOMATE_M1F 183
330#define SAA7134_BOARD_ENCORE_ENLTV_FM3 184 330#define SAA7134_BOARD_ENCORE_ENLTV_FM3 184
331#define SAA7134_BOARD_MAGICPRO_PROHDTV_PRO2 185 331#define SAA7134_BOARD_MAGICPRO_PROHDTV_PRO2 185
332#define SAA7134_BOARD_BEHOLD_501 186
333#define SAA7134_BOARD_BEHOLD_503FM 187
332 334
333#define SAA7134_MAXBOARDS 32 335#define SAA7134_MAXBOARDS 32
334#define SAA7134_INPUT_MAX 8 336#define SAA7134_INPUT_MAX 8