aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/em28xx
diff options
context:
space:
mode:
authorWitold Krecicki <wpk+lkml@culm.net>2014-10-19 18:25:59 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-03 08:33:36 -0500
commiteace972103923a5391bf34cf3ee67e009d88b785 (patch)
tree6c3ed809a3884c5f00020bf92023e5250cea312f /drivers/media/usb/em28xx
parent69e7b6503ee415a95cdc71b7811722e53a370712 (diff)
[media] em28xx: add support for Leadtek VC100 USB capture device
Leadtek VC100 is a simple USB capture stick, similar to Yakumo Movie Mixer. Signed-off-by: Witold Krecicki <wpk+lkml@culm.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/em28xx')
-rw-r--r--drivers/media/usb/em28xx/em28xx-cards.c16
-rw-r--r--drivers/media/usb/em28xx/em28xx.h1
2 files changed, 17 insertions, 0 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 71fa51e7984e..3c97bf106442 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -2243,6 +2243,20 @@ struct em28xx_board em28xx_boards[] = {
2243 .has_dvb = 1, 2243 .has_dvb = 1,
2244 .ir_codes = RC_MAP_PINNACLE_PCTV_HD, 2244 .ir_codes = RC_MAP_PINNACLE_PCTV_HD,
2245 }, 2245 },
2246 [EM2861_BOARD_LEADTEK_VC100] = {
2247 .name = "Leadtek VC100",
2248 .tuner_type = TUNER_ABSENT, /* Capture only device */
2249 .decoder = EM28XX_TVP5150,
2250 .input = { {
2251 .type = EM28XX_VMUX_COMPOSITE1,
2252 .vmux = TVP5150_COMPOSITE1,
2253 .amux = EM28XX_AMUX_LINE_IN,
2254 }, {
2255 .type = EM28XX_VMUX_SVIDEO,
2256 .vmux = TVP5150_SVIDEO,
2257 .amux = EM28XX_AMUX_LINE_IN,
2258 } },
2259 },
2246}; 2260};
2247EXPORT_SYMBOL_GPL(em28xx_boards); 2261EXPORT_SYMBOL_GPL(em28xx_boards);
2248 2262
@@ -2424,6 +2438,8 @@ struct usb_device_id em28xx_id_table[] = {
2424 .driver_info = EM28178_BOARD_PCTV_461E }, 2438 .driver_info = EM28178_BOARD_PCTV_461E },
2425 { USB_DEVICE(0x2013, 0x025f), 2439 { USB_DEVICE(0x2013, 0x025f),
2426 .driver_info = EM28178_BOARD_PCTV_292E }, 2440 .driver_info = EM28178_BOARD_PCTV_292E },
2441 { USB_DEVICE(0x0413, 0x6f07),
2442 .driver_info = EM2861_BOARD_LEADTEK_VC100 },
2427 { }, 2443 { },
2428}; 2444};
2429MODULE_DEVICE_TABLE(usb, em28xx_id_table); 2445MODULE_DEVICE_TABLE(usb, em28xx_id_table);
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index a21a7463b557..05e7f7c77ea1 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -141,6 +141,7 @@
141#define EM28178_BOARD_PCTV_461E 92 141#define EM28178_BOARD_PCTV_461E 92
142#define EM2874_BOARD_KWORLD_UB435Q_V3 93 142#define EM2874_BOARD_KWORLD_UB435Q_V3 93
143#define EM28178_BOARD_PCTV_292E 94 143#define EM28178_BOARD_PCTV_292E 94
144#define EM2861_BOARD_LEADTEK_VC100 95
144 145
145/* Limits minimum and default number of buffers */ 146/* Limits minimum and default number of buffers */
146#define EM28XX_MIN_BUF 4 147#define EM28XX_MIN_BUF 4