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

Commit 5a5e1da5 authored by Vasiliy Temnikov's avatar Vasiliy Temnikov Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (12574): support AverMedia Studio 505 



Added support to AverMedia Studio 505

[dougsland@redhat.com: fixed rejects and removed the change to add dk as default secam variant]
[mchehab@redhat.com: fix a few CodingStyle issues]
Signed-off-by: default avatarVasiliy Temnikov <vaka@newmail.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5bc53a9f

Documentation/video4linux/CARDLIST.saa7134

+1 −0
Original line number Diff line number Diff line
@@ -168,3 +168,4 @@ 
167 -> Beholder BeholdTV 609 RDS                [5ace:6092]

168 -> Beholder BeholdTV 609 RDS                [5ace:6093]

169 -> Compro VideoMate S350/S300               [185b:c900]

170 -> AverMedia AverTV Studio 505              [1461:a115]

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

+43 −0
Original line number Diff line number Diff line
@@ -1364,6 +1364,42 @@ struct saa7134_board saa7134_boards[] = { 
			.amux = LINE1,

		},

	},

	[SAA7134_BOARD_AVERMEDIA_STUDIO_505] = {

		/* Vasiliy Temnikov <vaka@newmail.ru> */

		.name           = "AverMedia AverTV Studio 505",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,

		.radio_type     = UNSET,

		.tuner_addr	= ADDR_UNSET,

		.radio_addr	= ADDR_UNSET,

		.tda9887_conf   = TDA9887_PRESENT,

		.inputs         = { {

			.name = name_tv,

			.vmux = 1,

			.amux = LINE2,

			.tv   = 1,

		}, {

			.name = name_comp1,

			.vmux = 0,

			.amux = LINE2,

		}, {

			.name = name_comp2,

			.vmux = 3,

			.amux = LINE2,

		},{

			.name = name_svideo,

			.vmux = 8,

			.amux = LINE2,

		} },

		.radio = {

			.name = name_radio,

			.amux = LINE2,

		},

		.mute = {

			.name = name_mute,

			.amux = LINE1,

		},

	},

	[SAA7134_BOARD_UPMOST_PURPLE_TV] = {

		.name           = "UPMOST PURPLE TV",

		.audio_clock    = 0x00187de7,
@@ -5397,6 +5433,12 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.subvendor    = 0x1461, /* Avermedia Technologies Inc */

		.subdevice    = 0x2115,

		.driver_data  = SAA7134_BOARD_AVERMEDIA_STUDIO_305,

	},{

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7130,

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

		.subdevice    = 0xa115,

		.driver_data  = SAA7134_BOARD_AVERMEDIA_STUDIO_505,

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7130,
@@ -6508,6 +6550,7 @@ int saa7134_board_init1(struct saa7134_dev *dev) 
	case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:

	case SAA7134_BOARD_KWORLD_XPERT:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_305:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_505:

	case SAA7134_BOARD_AVERMEDIA_305:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_307:

	case SAA7134_BOARD_AVERMEDIA_307:

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

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

	case SAA7134_BOARD_AVERMEDIA_307:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_305:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_505:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_307:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_507:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_507UA:

drivers/media/video/saa7134/saa7134.h

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ struct saa7134_format { 
#define SAA7134_BOARD_BEHOLD_609RDS_MK3     167

#define SAA7134_BOARD_BEHOLD_609RDS_MK5     168

#define SAA7134_BOARD_VIDEOMATE_S350        169

#define SAA7134_BOARD_AVERMEDIA_STUDIO_505  170



#define SAA7134_MAXBOARDS 32

#define SAA7134_INPUT_MAX 8