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

Commit de983454 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Mauro Carvalho Chehab
Browse files

[media] saa7134: add AverMedia AverTV/505 card support 



Add AverMedia AverTV/505 card to saa7134 driver. It is a card bearing
SAA7130HL chip and FQ1216ME/IH-3 tuner.

Working: Composite, TV and IR remote control.
Untested: S-Video.

[mchehab@osg.samsung.com: fix CodingStyle]
Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 4b7574fb

Documentation/video4linux/CARDLIST.saa7134

+1 −0
Original line number Original line Diff line number Diff line
@@ -192,3 +192,4 @@ 
191 -> Hawell HW-9004V1

191 -> Hawell HW-9004V1

192 -> AverMedia AverTV Satellite Hybrid+FM A706 [1461:2055]

192 -> AverMedia AverTV Satellite Hybrid+FM A706 [1461:2055]

193 -> WIS Voyager or compatible                [1905:7007]

193 -> WIS Voyager or compatible                [1905:7007]

194 -> AverMedia AverTV/505                     [1461:a10a]

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

+41 −1
Original line number Original line Diff line number Diff line
@@ -5851,6 +5851,39 @@ struct saa7134_board saa7134_boards[] = { 
		.amux = LINE1,

		.amux = LINE1,

		} },

		} },

	},

	},

	[SAA7134_BOARD_AVERMEDIA_505] = {

		/* much like the "studio" version but without radio

		* and another tuner (dbaryshkov@gmail.com) */

		.name           = "AverMedia AverTV/505",

		.audio_clock    = 0x00187de7,

		.tuner_type     = TUNER_PHILIPS_FQ1216ME,

		.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,

		} },

		.mute = {

			.name = name_mute,

			.amux = LINE1,

		},

	},





};

};
@@ -7109,6 +7142,12 @@ struct pci_device_id saa7134_pci_tbl[] = { 
		.subvendor    = 0x1905, /* WIS */

		.subvendor    = 0x1905, /* WIS */

		.subdevice    = 0x7007,

		.subdevice    = 0x7007,

		.driver_data  = SAA7134_BOARD_WIS_VOYAGER,

		.driver_data  = SAA7134_BOARD_WIS_VOYAGER,

	}, {

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.device       = PCI_DEVICE_ID_PHILIPS_SAA7130,

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

		.subdevice    = 0xa10a,

		.driver_data  = SAA7134_BOARD_AVERMEDIA_505,

	}, {

	}, {

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

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

		.vendor       = PCI_VENDOR_ID_PHILIPS,

		.vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -7449,8 +7488,9 @@ int saa7134_board_init1(struct saa7134_dev *dev) 
	case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:

	case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:

	case SAA7134_BOARD_KWORLD_XPERT:

	case SAA7134_BOARD_KWORLD_XPERT:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_305:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_305:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_505:

	case SAA7134_BOARD_AVERMEDIA_305:

	case SAA7134_BOARD_AVERMEDIA_305:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_505:

	case SAA7134_BOARD_AVERMEDIA_505:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_307:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_307:

	case SAA7134_BOARD_AVERMEDIA_307:

	case SAA7134_BOARD_AVERMEDIA_307:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_507:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_507:

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -485,6 +485,7 @@ static int __saa7134_ir_start(void *priv) 
	case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:

	case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:

	case SAA7134_BOARD_AVERMEDIA_305:

	case SAA7134_BOARD_AVERMEDIA_305:

	case SAA7134_BOARD_AVERMEDIA_307:

	case SAA7134_BOARD_AVERMEDIA_307:

	case SAA7134_BOARD_AVERMEDIA_505:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_305:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_305:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_505:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_505:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_307:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_307:
@@ -633,6 +634,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) 
	case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:

	case SAA7134_BOARD_KWORLD_VSTREAM_XPERT:

	case SAA7134_BOARD_AVERMEDIA_305:

	case SAA7134_BOARD_AVERMEDIA_305:

	case SAA7134_BOARD_AVERMEDIA_307:

	case SAA7134_BOARD_AVERMEDIA_307:

	case SAA7134_BOARD_AVERMEDIA_505:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_305:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_305:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_505:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_505:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_307:

	case SAA7134_BOARD_AVERMEDIA_STUDIO_307:

drivers/media/pci/saa7134/saa7134.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -341,6 +341,7 @@ struct saa7134_card_ir { 
#define SAA7134_BOARD_HAWELL_HW_9004V1      191

#define SAA7134_BOARD_HAWELL_HW_9004V1      191

#define SAA7134_BOARD_AVERMEDIA_A706		192

#define SAA7134_BOARD_AVERMEDIA_A706		192

#define SAA7134_BOARD_WIS_VOYAGER           193

#define SAA7134_BOARD_WIS_VOYAGER           193

#define SAA7134_BOARD_AVERMEDIA_505         194





#define SAA7134_MAXBOARDS 32

#define SAA7134_MAXBOARDS 32

#define SAA7134_INPUT_MAX 8

#define SAA7134_INPUT_MAX 8