Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df0dbbe2 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (11442): saa7134: BZ#7524: Add AVerTV Studio 507UA support 



[mchehab@redhat.com: Fix merge conflicts and CodingStyle issues]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent abce21f4

Documentation/video4linux/CARDLIST.saa7134

+1 −0
Original line number Original line Diff line number Diff line
@@ -155,3 +155,4 @@ 
154 -> Avermedia AVerTV GO 007 FM Plus          [1461:f31d]

154 -> Avermedia AVerTV GO 007 FM Plus          [1461:f31d]

155 -> Hauppauge WinTV-HVR1120 ATSC/QAM-Hybrid  [0070:6706,0070:6708]

155 -> Hauppauge WinTV-HVR1120 ATSC/QAM-Hybrid  [0070:6706,0070:6708]

156 -> Hauppauge WinTV-HVR1110r3                [0070:6707,0070:6709,0070:670a]

156 -> Hauppauge WinTV-HVR1110r3                [0070:6707,0070:6709,0070:670a]

157 -> Avermedia AVerTV Studio 507UA            [1461:a11b]

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

+44 −0
Original line number Original line Diff line number Diff line
@@ -4753,6 +4753,44 @@ struct saa7134_board saa7134_boards[] = { 
			.gpio = 0x01,

			.gpio = 0x01,

		},

		},

	},

	},

	[SAA7134_BOARD_AVERMEDIA_STUDIO_507UA] = {

		/* Andy Shevchenko <andy@smile.org.ua> */

		.name           = "Avermedia AVerTV Studio 507UA",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3, /* Should be MK5 */

		.radio_type     = UNSET,

		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.tda9887_conf   = TDA9887_PRESENT,

		.gpiomask       = 0x03,

		.inputs         = { {

			.name = name_tv,

			.vmux = 1,

			.amux = TV,

			.tv   = 1,

			.gpio = 0x00,

		}, {

			.name = name_comp1,

			.vmux = 3,

			.amux = LINE1,

			.gpio = 0x00,

		}, {

			.name = name_svideo,

			.vmux = 8,

			.amux = LINE1,

			.gpio = 0x00,

		} },

		.radio = {

			.name = name_radio,

			.amux = LINE2,

			.gpio = 0x01,

		},

		.mute  = {

			.name = name_mute,

			.amux = LINE1,

			.gpio = 0x00,

		},

	},

};

};





const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);

const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -5439,6 +5477,12 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.subvendor    = 0x1461, /* Avermedia Technologies Inc */

		.subvendor    = 0x1461, /* Avermedia Technologies Inc */

		.subdevice    = 0x9715,

		.subdevice    = 0x9715,

		.driver_data  = SAA7134_BOARD_AVERMEDIA_STUDIO_507,

		.driver_data  = SAA7134_BOARD_AVERMEDIA_STUDIO_507,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7134,

		.subvendor    = 0x1461, /* Avermedia Technologies Inc */

		.subdevice    = 0xa11b,

		.driver_data  = SAA7134_BOARD_AVERMEDIA_STUDIO_507UA,

	}, {

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -447,6 +447,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) 
	case SAA7134_BOARD_AVERMEDIA_STUDIO_305:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_305:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_307:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_307:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_507:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_507:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_507UA:

	case SAA7134_BOARD_AVERMEDIA_GO_007_FM:

	case SAA7134_BOARD_AVERMEDIA_GO_007_FM:

	case SAA7134_BOARD_AVERMEDIA_M102:

	case SAA7134_BOARD_AVERMEDIA_M102:

	case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS:

	case SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS:

drivers/media/video/saa7134/saa7134.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -280,6 +280,7 @@ struct saa7134_format { 
#define SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS 154

#define SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS 154

#define SAA7134_BOARD_HAUPPAUGE_HVR1120     155

#define SAA7134_BOARD_HAUPPAUGE_HVR1120     155

#define SAA7134_BOARD_HAUPPAUGE_HVR1110R3   156

#define SAA7134_BOARD_HAUPPAUGE_HVR1110R3   156

#define SAA7134_BOARD_AVERMEDIA_STUDIO_507UA 157





#define SAA7134_MAXBOARDS 32

#define SAA7134_MAXBOARDS 32

#define SAA7134_INPUT_MAX 8

#define SAA7134_INPUT_MAX 8