From 0eaa377fdd3473294e4dace1e129a14d426bf598 Mon Sep 17 00:00:00 2001
From: Douglas Kosovic <douglask@itee.uq.edu.au>
Date: Thu, 22 Jan 2009 23:07:26 -0300
Subject: [PATCH] --- yaml --- r: 137733 b: refs/heads/master c:
 ade0815c16734e8c25dbac9faf5b5d63bcccd533 h: refs/heads/master i:   137731:
 5dfaf5ce7239ad46aa8547ca4efca6273f69a8b7 v: v3

---
 [refs]                                        |  2 +-
 trunk/Documentation/video4linux/CARDLIST.bttv |  1 +
 trunk/drivers/media/video/bt8xx/bttv-cards.c  | 17 +++++++++++++++++
 trunk/drivers/media/video/bt8xx/bttv.h        |  1 +
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d4d639bf7414..1af62630916c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be9ed5117d95cdc4e601f9da220ebeaaab131679
+refs/heads/master: ade0815c16734e8c25dbac9faf5b5d63bcccd533
diff --git a/trunk/Documentation/video4linux/CARDLIST.bttv b/trunk/Documentation/video4linux/CARDLIST.bttv
index 0d93fa1ac25e..4dfe62641374 100644
--- a/trunk/Documentation/video4linux/CARDLIST.bttv
+++ b/trunk/Documentation/video4linux/CARDLIST.bttv
@@ -154,3 +154,4 @@
 153 -> PHYTEC VD-012 (bt878)
 154 -> PHYTEC VD-012-X1 (bt878)
 155 -> PHYTEC VD-012-X2 (bt878)
+156 -> IVCE-8784                                           [0000:f050,0001:f050,0002:f050,0003:f050]
diff --git a/trunk/drivers/media/video/bt8xx/bttv-cards.c b/trunk/drivers/media/video/bt8xx/bttv-cards.c
index d24dcc025e37..9dfd8c70e4fb 100644
--- a/trunk/drivers/media/video/bt8xx/bttv-cards.c
+++ b/trunk/drivers/media/video/bt8xx/bttv-cards.c
@@ -246,6 +246,10 @@ static struct CARD {
 	{ 0xa182ff0d, BTTV_BOARD_IVC120,        "IVC-120G" },
 	{ 0xa182ff0e, BTTV_BOARD_IVC120,        "IVC-120G" },
 	{ 0xa182ff0f, BTTV_BOARD_IVC120,        "IVC-120G" },
+	{ 0xf0500000, BTTV_BOARD_IVCE8784,      "IVCE-8784" },
+	{ 0xf0500001, BTTV_BOARD_IVCE8784,      "IVCE-8784" },
+	{ 0xf0500002, BTTV_BOARD_IVCE8784,      "IVCE-8784" },
+	{ 0xf0500003, BTTV_BOARD_IVCE8784,      "IVCE-8784" },
 
 	{ 0x41424344, BTTV_BOARD_GRANDTEC,      "GrandTec Multi Capture" },
 	{ 0x01020304, BTTV_BOARD_XGUARD,        "Grandtec Grand X-Guard" },
@@ -2162,6 +2166,19 @@ struct tvcard bttv_tvcards[] = {
 		.muxsel         = { 2 },
 		.pll            = PLL_28,
 	},
+	[BTTV_BOARD_IVCE8784] = {
+		.name           = "IVCE-8784",
+		.video_inputs   = 1,
+		.audio_inputs   = 0,
+		.tuner          = UNSET,
+		.tuner_type     = UNSET,
+		.tuner_addr     = ADDR_UNSET,
+		.radio_addr     = ADDR_UNSET,
+		.svhs           = UNSET,
+		.gpiomask       = 0xdf,
+		.muxsel         = { 2 },
+		.pll            = PLL_28,
+	},
 	[BTTV_BOARD_XGUARD] = {
 		.name           = "Grand X-Guard / Trust 814PCI",
 		.video_inputs   = 16,
diff --git a/trunk/drivers/media/video/bt8xx/bttv.h b/trunk/drivers/media/video/bt8xx/bttv.h
index 529bf6cf634d..a7bcad171823 100644
--- a/trunk/drivers/media/video/bt8xx/bttv.h
+++ b/trunk/drivers/media/video/bt8xx/bttv.h
@@ -180,6 +180,7 @@
 #define BTTV_BOARD_VD012		   0x99
 #define BTTV_BOARD_VD012_X1		   0x9a
 #define BTTV_BOARD_VD012_X2		   0x9b
+#define BTTV_BOARD_IVCE8784		   0x9c
 
 
 /* more card-specific defines */