From daf4211d929ec04f3b6a59f1d0232875247d5da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alf=20H=C3=B8gemark?= <alf@i100.no>
Date: Wed, 28 Nov 2012 14:29:16 -0300
Subject: [PATCH] --- yaml --- r: 357172 b: refs/heads/master c:
 68c97bf39ad853063876f4a8449009c1620d972a h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/usb/cx231xx/cx231xx-cards.c | 29 +++++++++++++++++++
 trunk/drivers/media/usb/cx231xx/cx231xx.h     |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8c4e82841bb1..53e6eb2ee73a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afe5624b142279c6072ce1872811e309ad7e94be
+refs/heads/master: 68c97bf39ad853063876f4a8449009c1620d972a
diff --git a/trunk/drivers/media/usb/cx231xx/cx231xx-cards.c b/trunk/drivers/media/usb/cx231xx/cx231xx-cards.c
index bbed1e40eeda..94b573ad96d5 100644
--- a/trunk/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/trunk/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -603,6 +603,33 @@ struct cx231xx_board cx231xx_boards[] = {
 			.gpio = NULL,
 		} },
 	},
+	[CX231XX_BOARD_ELGATO_VIDEO_CAPTURE_V2] = {
+		.name = "Elgato Video Capture V2",
+		.tuner_type = TUNER_ABSENT,
+		.decoder = CX231XX_AVDECODER,
+		.output_mode = OUT_MODE_VIP11,
+		.demod_xfer_mode = 0,
+		.ctl_pin_status_mask = 0xFFFFFFC4,
+		.agc_analog_digital_select_gpio = 0x0c,
+		.gpio_pin_status_mask = 0x4001000,
+		.norm = V4L2_STD_NTSC,
+		.no_alt_vanc = 1,
+		.external_av = 1,
+		.dont_use_port_3 = 1,
+		.input = {{
+			.type = CX231XX_VMUX_COMPOSITE1,
+			.vmux = CX231XX_VIN_2_1,
+			.amux = CX231XX_AMUX_LINE_IN,
+			.gpio = NULL,
+		}, {
+			.type = CX231XX_VMUX_SVIDEO,
+			.vmux = CX231XX_VIN_1_1 |
+				(CX231XX_VIN_1_2 << 8) |
+				CX25840_SVIDEO_ON,
+			.amux = CX231XX_AMUX_LINE_IN,
+			.gpio = NULL,
+		} },
+	},
 };
 const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards);
 
@@ -642,6 +669,8 @@ struct usb_device_id cx231xx_id_table[] = {
 	 .driver_info = CX231XX_BOARD_KWORLD_UB430_USB_HYBRID},
 	{USB_DEVICE(0x1f4d, 0x0237),
 	 .driver_info = CX231XX_BOARD_ICONBIT_U100},
+	{USB_DEVICE(0x0fd9, 0x0037),
+	 .driver_info = CX231XX_BOARD_ELGATO_VIDEO_CAPTURE_V2},
 	{},
 };
 
diff --git a/trunk/drivers/media/usb/cx231xx/cx231xx.h b/trunk/drivers/media/usb/cx231xx/cx231xx.h
index a89d020de948..3e11462be0d0 100644
--- a/trunk/drivers/media/usb/cx231xx/cx231xx.h
+++ b/trunk/drivers/media/usb/cx231xx/cx231xx.h
@@ -68,6 +68,7 @@
 #define CX231XX_BOARD_ICONBIT_U100 13
 #define CX231XX_BOARD_HAUPPAUGE_USB2_FM_PAL 14
 #define CX231XX_BOARD_HAUPPAUGE_USB2_FM_NTSC 15
+#define CX231XX_BOARD_ELGATO_VIDEO_CAPTURE_V2 16
 
 /* Limits minimum and default number of buffers */
 #define CX231XX_MIN_BUF                 4