Commit a61f96bc authored by sensoray-dev's avatar sensoray-dev Committed by Mauro Carvalho Chehab
Browse files

[media] saa7134: adding Sensoray boards to saa7134 driver 



commit cf5886c3dd2f65c817cb6ca5e7202fa3a3bdc872

Signed-off-by: default avatarDean Anderson <linux-dev@sensoray.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent c27e3050

Documentation/video4linux/CARDLIST.saa7134

+1 −0
Original line number Diff line number Diff line
@@ -186,3 +186,4 @@ 
185 -> MagicPro ProHDTV Pro2 DMB-TH/Hybrid      [17de:d136]

186 -> Beholder BeholdTV 501                    [5ace:5010]

187 -> Beholder BeholdTV 503 FM                 [5ace:5030]

188 -> Sensoray 811/911                         [6000:0811,6000:0911]

drivers/media/video/saa7134/saa7134-cards.c

+33 −0
Original line number Diff line number Diff line
@@ -5691,6 +5691,27 @@ struct saa7134_board saa7134_boards[] = { 
			.amux = LINE1,

		},

	},

	[SAA7134_BOARD_SENSORAY811_911] = {

		.name		= "Sensoray 811/911",

		.audio_clock	= 0x00200000,

		.tuner_type	= TUNER_ABSENT,

		.radio_type	= UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

		.inputs		= {{

			.name   = name_comp1,

			.vmux   = 0,

			.amux   = LINE1,

		}, {

			.name   = name_comp3,

			.vmux   = 2,

			.amux   = LINE1,

		}, {

			.name   = name_svideo,

			.vmux   = 8,

			.amux   = LINE1,

		} },

	},



};
@@ -6913,6 +6934,18 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.subvendor    = 0x17de,

		.subdevice    = 0xd136,

		.driver_data  = SAA7134_BOARD_MAGICPRO_PROHDTV_PRO2,

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x6000,

		.subdevice    = 0x0811,

		.driver_data  = SAA7134_BOARD_SENSORAY811_911,

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.subvendor    = 0x6000,

		.subdevice    = 0x0911,

		.driver_data  = SAA7134_BOARD_SENSORAY811_911,

	}, {

		/* --- boards without eeprom + subsystem ID --- */

		.vendor       = PCI_VENDOR_ID_PHILIPS,

drivers/media/video/saa7134/saa7134.h

+1 −0
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ struct saa7134_card_ir { 
#define SAA7134_BOARD_MAGICPRO_PROHDTV_PRO2 185

#define SAA7134_BOARD_BEHOLD_501            186

#define SAA7134_BOARD_BEHOLD_503FM          187

#define SAA7134_BOARD_SENSORAY811_911       188



#define SAA7134_MAXBOARDS 32

#define SAA7134_INPUT_MAX 8