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

Commit d3603341 authored by Vitaly Wool's avatar Vitaly Wool Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8540): em28xx-cards: Add Compro VideoMate ForYou/Stereo model 



Added Compro VideoMate ForYou/Stereo model (analog only)

Signed-off-by: default avatarVitaly Wool <vital@embeddedalley.com>
[dougsland@gmail.com: Solved conflicts with v4l-dvb devel tree]
Signed-off-by: default avatarDouglas Schilling Landgraf <dougsland@gmail.com>
[mchehab@infradead.org: Need to fix some merge conflicts]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 95b86a9a

Documentation/video4linux/CARDLIST.em28xx

+1 −0
Original line number Diff line number Diff line
@@ -57,3 +57,4 @@ 
 56 -> Pinnacle Hybrid Pro (2)                  (em2882)        [2304:0226]

 57 -> Kworld PlusTV HD Hybrid 330              (em2883)        [eb1a:a316]

 58 -> Hauppauge WinTV HVR 950                  (em2883)

 59 -> Compro VideoMate ForYou/Stereo           (em2820/em2840) [185b:2041]

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

+18 −0
Original line number Diff line number Diff line
@@ -1134,6 +1134,22 @@ struct em28xx_board em28xx_boards[] = { 
			.amux     = 1,

		} },

	},

	[EM2820_BOARD_COMPRO_VIDEO_MATE] = {

		.name         = "Compro VideoMate ForYou/Stereo",

		.vchannels    = 2,

		.tuner_type   = TUNER_LG_PAL_NEW_TAPC,

		.tda9887_conf = TDA9887_PRESENT,

		.decoder      = EM28XX_TVP5150,

		.input          = { {

			.type     = EM28XX_VMUX_TELEVISION,

			.vmux     = TVP5150_COMPOSITE0,

			.amux     = EM28XX_AMUX_LINE_IN,

		}, {

			.type     = EM28XX_VMUX_SVIDEO,

			.vmux     = TVP5150_SVIDEO,

			.amux     = EM28XX_AMUX_LINE_IN,

		} },

	},

};

const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
@@ -1195,6 +1211,8 @@ struct usb_device_id em28xx_id_table [] = { 
			.driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },

	{ USB_DEVICE(0x185b, 0x2870),

			.driver_info = EM2870_BOARD_COMPRO_VIDEOMATE },

	{ USB_DEVICE(0x185b, 0x2041),

			.driver_info = EM2820_BOARD_COMPRO_VIDEO_MATE },

	{ USB_DEVICE(0x2040, 0x4200),

			.driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },

	{ USB_DEVICE(0x2040, 0x4201),

drivers/media/video/em28xx/em28xx.h

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
#define EM2882_BOARD_PINNACLE_HYBRID_PRO	  56

#define EM2883_BOARD_KWORLD_HYBRID_A316		  57

#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950	  58

#define EM2820_BOARD_COMPRO_VIDEO_MATE		  59



/* Limits minimum and default number of buffers */

#define EM28XX_MIN_BUF 4