The patch number 8540 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Vitaly Wool <[EMAIL PROTECTED]>
em28xx-cards: Add Compro VideoMate ForYou/Stereo model
Added Compro VideoMate ForYou/Stereo model (analog only)
Signed-off-by: Vitaly Wool <[EMAIL PROTECTED]>
[EMAIL PROTECTED]: Solved conflicts with v4l-dvb devel tree]
Signed-off-by: Douglas Schilling Landgraf <[EMAIL PROTECTED]>
[EMAIL PROTECTED]: Need to fix some merge conflicts]
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/Documentation/video4linux/CARDLIST.em28xx | 1
linux/drivers/media/video/em28xx/em28xx-cards.c | 18 ++++++++++++++++
linux/drivers/media/video/em28xx/em28xx.h | 1
3 files changed, 20 insertions(+)
diff -r 572c09c6861b -r cd71b4080a1a
linux/Documentation/video4linux/CARDLIST.em28xx
--- a/linux/Documentation/video4linux/CARDLIST.em28xx Sun Jul 27 14:03:32
2008 -0300
+++ b/linux/Documentation/video4linux/CARDLIST.em28xx Sun Jul 27 14:10:11
2008 -0300
@@ -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]
diff -r 572c09c6861b -r cd71b4080a1a
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Sun Jul 27 14:03:32
2008 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Sun Jul 27 14:10:11
2008 -0300
@@ -1133,6 +1133,22 @@ struct em28xx_board em28xx_boards[] = {
.type = EM28XX_VMUX_SVIDEO,
.vmux = TVP5150_SVIDEO,
.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,
} },
},
};
@@ -1196,6 +1212,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),
diff -r 572c09c6861b -r cd71b4080a1a linux/drivers/media/video/em28xx/em28xx.h
--- a/linux/drivers/media/video/em28xx/em28xx.h Sun Jul 27 14:03:32 2008 -0300
+++ b/linux/drivers/media/video/em28xx/em28xx.h Sun Jul 27 14:10:11 2008 -0300
@@ -98,6 +98,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
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/cd71b4080a1a0fa3c66bc803d0e895dfaf989288
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
