Commit d45170ed authored by Nickolay V. Shmyrev's avatar Nickolay V. Shmyrev Committed by Linus Torvalds
Browse files

[PATCH] v4l: 628: added new avermedia card 550 



- Added new Avermedia card 550

Signed-off-by: default avatarNickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2d14f78e

Documentation/video4linux/CARDLIST.cx88

+1 −0
Original line number Diff line number Diff line
@@ -30,3 +30,4 @@ card=28 - DViCO FusionHDTV 3 Gold-T 
card=29 - ADS Tech Instant TV DVB-T PCI

card=30 - TerraTec Cinergy 1400 DVB-T

card=31 - DViCO FusionHDTV 5 Gold

card=32 - AverMedia UltraTV Media Center PCI 550

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

+31 −0
Original line number Diff line number Diff line
@@ -776,6 +776,33 @@ struct cx88_board cx88_boards[] = { 
                }},

		.dvb            = 1,

	},

	[CX88_BOARD_AVERMEDIA_ULTRATV_MC_550] = {

		.name           = "AverMedia UltraTV Media Center PCI 550",

		.tuner_type     = TUNER_PHILIPS_FM1236_MK3,

		.radio_type     = UNSET,

		.tuner_addr     = ADDR_UNSET,

		.radio_addr     = ADDR_UNSET,

		.tda9887_conf   = TDA9887_PRESENT,

		.blackbird      = 1,

		.input          = {{

			.type   = CX88_VMUX_COMPOSITE1,

			.vmux   = 0,

			.gpio0  = 0x0000cd73,

		},{

			.type   = CX88_VMUX_SVIDEO,

			.vmux   = 1,

			.gpio0  = 0x0000cd73,

		},{

			.type   = CX88_VMUX_TELEVISION,

			.vmux   = 3,

			.gpio0  = 0x0000cdb3,

		}},

		.radio = {

			.type   = CX88_RADIO,

			.vmux   = 2,

			.gpio0  = 0x0000cdf3,

		},

	},

};

const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
@@ -907,6 +934,10 @@ struct cx88_subid cx88_subids[] = { 
		.subvendor = 0x18ac,

		.subdevice = 0xd500,

		.card      = CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD,

 	},{

		.subvendor = 0x1461,

		.subdevice = 0x8011,

		.card      = CX88_BOARD_AVERMEDIA_ULTRATV_MC_550,

	},

};

const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);

drivers/media/video/cx88/cx88.h

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ extern struct sram_channel cx88_sram_channels[]; 
#define CX88_BOARD_ADSTECH_DVB_T_PCI          29

#define CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1  30

#define CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD 31

#define CX88_BOARD_AVERMEDIA_ULTRATV_MC_550 32



enum cx88_itype {

	CX88_VMUX_COMPOSITE1 = 1,