mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-14 06:35:12 +00:00
Code Issues Releases Wiki Activity

media: em28xx: Add support for Magix Wideowandler 2

Browse source 
Add support for Magix Wideowandler 2 - analog USB capture card

Signed-off-by: Dominik Danelski <dominik@danelski.pl>
Co-author: Cornelius Porosanu <cornelius591@gmail.com>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Dominik Danelski 2019-09-01 18:27:46 -03:00 committed by Mauro Carvalho Chehab
parent ed4e15697b
commit 3eab054614
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/media/usb/em28xx/em28xx-cards.c
View file

@ -2487,6 +2487,24 @@ const struct em28xx_board em28xx_boards[] = {
.ir_codes = RC_MAP_HAUPPAUGE,
.leds = hauppauge_dualhd_leds,
},
/*
* 1b80:e349 Magix USB Videowandler-2
* (same chips as Honestech VIDBOX NW03)
* Empia EM2860, Philips SAA7113, Empia EMP202, No Tuner
*/
[EM2861_BOARD_MAGIX_VIDEOWANDLER2] = {
.name = "Magix USB Videowandler-2",
.tuner_type = TUNER_ABSENT,
.decoder = EM28XX_SAA711X,
.input = { {
.type = EM28XX_VMUX_COMPOSITE,
.vmux = SAA7115_COMPOSITE0,
.amux = EM28XX_AMUX_LINE_IN,
}, {
.type = EM28XX_VMUX_SVIDEO,
.amux = EM28XX_AMUX_LINE_IN,
} },
},
};
EXPORT_SYMBOL_GPL(em28xx_boards);
@ -2696,6 +2714,8 @@ struct usb_device_id em28xx_id_table[] = {
.driver_info = EM28178_BOARD_PLEX_PX_BCUD },
{ USB_DEVICE(0xeb1a, 0x5051), /* Ion Video 2 PC MKII / Startech svid2usb23 / Raygo R12-41373 */
.driver_info = EM2860_BOARD_TVP5150_REFERENCE_DESIGN },
{ USB_DEVICE(0x1b80, 0xe349), /* Magix USB Videowandler-2 */
.driver_info = EM2861_BOARD_MAGIX_VIDEOWANDLER2 },
{ },
};
MODULE_DEVICE_TABLE(usb, em28xx_id_table);

1
drivers/media/usb/em28xx/em28xx.h
View file

@ -149,6 +149,7 @@
#define EM28174_BOARD_HAUPPAUGE_WINTV_DUALHD_01595 100
#define EM2884_BOARD_TERRATEC_H6 101
#define EM2882_BOARD_ZOLID_HYBRID_TV_STICK 102
#define EM2861_BOARD_MAGIX_VIDEOWANDLER2 103
/* Limits minimum and default number of buffers */
#define EM28XX_MIN_BUF 4