diff options
author | sensoray-dev <linux-dev@sensoray.com> | 2011-10-24 18:46:52 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-07 08:58:09 -0500 |
commit | a61f96bc3abccc8b41e422da8e808eb685527305 (patch) | |
tree | 091df32004aedcc10fb37957ec2f24c63ab07564 /drivers/media/video/saa7134 | |
parent | c27e3050378ec0d96d964cbf18746a30ad00ab9f (diff) |
[media] saa7134: adding Sensoray boards to saa7134 driver
commit cf5886c3dd2f65c817cb6ca5e7202fa3a3bdc872
Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 33 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 0f9fb99adeb4..065d0f6be4a0 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -5691,6 +5691,27 @@ struct saa7134_board saa7134_boards[] = { | |||
5691 | .amux = LINE1, | 5691 | .amux = LINE1, |
5692 | }, | 5692 | }, |
5693 | }, | 5693 | }, |
5694 | [SAA7134_BOARD_SENSORAY811_911] = { | ||
5695 | .name = "Sensoray 811/911", | ||
5696 | .audio_clock = 0x00200000, | ||
5697 | .tuner_type = TUNER_ABSENT, | ||
5698 | .radio_type = UNSET, | ||
5699 | .tuner_addr = ADDR_UNSET, | ||
5700 | .radio_addr = ADDR_UNSET, | ||
5701 | .inputs = {{ | ||
5702 | .name = name_comp1, | ||
5703 | .vmux = 0, | ||
5704 | .amux = LINE1, | ||
5705 | }, { | ||
5706 | .name = name_comp3, | ||
5707 | .vmux = 2, | ||
5708 | .amux = LINE1, | ||
5709 | }, { | ||
5710 | .name = name_svideo, | ||
5711 | .vmux = 8, | ||
5712 | .amux = LINE1, | ||
5713 | } }, | ||
5714 | }, | ||
5694 | 5715 | ||
5695 | }; | 5716 | }; |
5696 | 5717 | ||
@@ -6914,6 +6935,18 @@ struct pci_device_id saa7134_pci_tbl[] = { | |||
6914 | .subdevice = 0xd136, | 6935 | .subdevice = 0xd136, |
6915 | .driver_data = SAA7134_BOARD_MAGICPRO_PROHDTV_PRO2, | 6936 | .driver_data = SAA7134_BOARD_MAGICPRO_PROHDTV_PRO2, |
6916 | }, { | 6937 | }, { |
6938 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
6939 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
6940 | .subvendor = 0x6000, | ||
6941 | .subdevice = 0x0811, | ||
6942 | .driver_data = SAA7134_BOARD_SENSORAY811_911, | ||
6943 | }, { | ||
6944 | .vendor = PCI_VENDOR_ID_PHILIPS, | ||
6945 | .device = PCI_DEVICE_ID_PHILIPS_SAA7133, | ||
6946 | .subvendor = 0x6000, | ||
6947 | .subdevice = 0x0911, | ||
6948 | .driver_data = SAA7134_BOARD_SENSORAY811_911, | ||
6949 | }, { | ||
6917 | /* --- boards without eeprom + subsystem ID --- */ | 6950 | /* --- boards without eeprom + subsystem ID --- */ |
6918 | .vendor = PCI_VENDOR_ID_PHILIPS, | 6951 | .vendor = PCI_VENDOR_ID_PHILIPS, |
6919 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, | 6952 | .device = PCI_DEVICE_ID_PHILIPS_SAA7134, |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 9b550687213a..4ad9de4410d4 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -330,6 +330,7 @@ struct saa7134_card_ir { | |||
330 | #define SAA7134_BOARD_MAGICPRO_PROHDTV_PRO2 185 | 330 | #define SAA7134_BOARD_MAGICPRO_PROHDTV_PRO2 185 |
331 | #define SAA7134_BOARD_BEHOLD_501 186 | 331 | #define SAA7134_BOARD_BEHOLD_501 186 |
332 | #define SAA7134_BOARD_BEHOLD_503FM 187 | 332 | #define SAA7134_BOARD_BEHOLD_503FM 187 |
333 | #define SAA7134_BOARD_SENSORAY811_911 188 | ||
333 | 334 | ||
334 | #define SAA7134_MAXBOARDS 32 | 335 | #define SAA7134_MAXBOARDS 32 |
335 | #define SAA7134_INPUT_MAX 8 | 336 | #define SAA7134_INPUT_MAX 8 |