From 6f3aac8ac9b5c46bf7db7977c66ebd2628f847fb Mon Sep 17 00:00:00 2001
From: Malcolm Valentine <farkit@iinet.net.au>
Date: Mon, 29 May 2006 13:51:59 -0300
Subject: [PATCH] --- yaml --- r: 29984 b: refs/heads/master c:
 4bd6e9d968af68c73bee92bd93cd56937e2e80d8 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/Documentation/video4linux/CARDLIST.cx88 |  1 +
 trunk/drivers/media/video/cx88/cx88-cards.c   | 22 +++++++++++++++++++
 trunk/drivers/media/video/cx88/cx88-dvb.c     |  1 +
 trunk/drivers/media/video/cx88/cx88.h         |  3 ++-
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5472eda53a5a..527740f1f5c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc53f78306a70d58e26f93d40ce19e61297cc18f
+refs/heads/master: 4bd6e9d968af68c73bee92bd93cd56937e2e80d8
diff --git a/trunk/Documentation/video4linux/CARDLIST.cx88 b/trunk/Documentation/video4linux/CARDLIST.cx88
index f6b0936c2fd5..f9636fd6bc32 100644
--- a/trunk/Documentation/video4linux/CARDLIST.cx88
+++ b/trunk/Documentation/video4linux/CARDLIST.cx88
@@ -49,3 +49,4 @@
  48 -> Kworld MCE 200 Deluxe                               [17de:0841]
  49 -> PixelView PlayTV P7000                              [1554:4813]
  50 -> NPG Tech Real TV                                    [14f1:0842]
+ 51 -> WinFast DTV2000 H                                   [107d:665e]
diff --git a/trunk/drivers/media/video/cx88/cx88-cards.c b/trunk/drivers/media/video/cx88/cx88-cards.c
index 352565f4fc99..368a65934e31 100644
--- a/trunk/drivers/media/video/cx88/cx88-cards.c
+++ b/trunk/drivers/media/video/cx88/cx88-cards.c
@@ -1175,6 +1175,24 @@ struct cx88_board cx88_boards[] = {
 			 .gpio0 = 0x074a,
 		},
 	},
+	[CX88_BOARD_WINFAST_DTV2000H] = {
+		/* video inputs and radio still in testing */
+		.name           = "WinFast DTV2000 H",
+		.tuner_type     = TUNER_PHILIPS_FMD1216ME_MK3,
+		.radio_type     = UNSET,
+		.tuner_addr     = ADDR_UNSET,
+		.radio_addr     = ADDR_UNSET,
+		.tda9887_conf   = TDA9887_PRESENT,
+		.input          = {{
+			.type   = CX88_VMUX_TELEVISION,
+			.vmux   = 0,
+			.gpio0  = 0x00017304,
+			.gpio1  = 0x00008203,
+			.gpio2  = 0x00017304,
+			.gpio3  = 0x02000000,
+		}},
+		.dvb            = 1,
+	},
 };
 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
 
@@ -1412,6 +1430,10 @@ struct cx88_subid cx88_subids[] = {
 		.subvendor = 0x14f1,
 		.subdevice = 0x0842,
 		.card      = CX88_BOARD_NPGTECH_REALTV,
+	},{
+		.subvendor = 0x107d,
+		.subdevice = 0x665e,
+		.card      = CX88_BOARD_WINFAST_DTV2000H,
 	},
 };
 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
diff --git a/trunk/drivers/media/video/cx88/cx88-dvb.c b/trunk/drivers/media/video/cx88/cx88-dvb.c
index bf89cbf2b058..a3a628739a9c 100644
--- a/trunk/drivers/media/video/cx88/cx88-dvb.c
+++ b/trunk/drivers/media/video/cx88/cx88-dvb.c
@@ -533,6 +533,7 @@ static int dvb_register(struct cx8802_dev *dev)
 			dvb_pll_attach(dev->dvb.frontend, 0x60, &dev->core->i2c_adap, &dvb_pll_thomson_dtt7579);
 		}
 		break;
+	case CX88_BOARD_WINFAST_DTV2000H:
 	case CX88_BOARD_HAUPPAUGE_HVR1100:
 	case CX88_BOARD_HAUPPAUGE_HVR1100LP:
 		dev->dvb.frontend = cx22702_attach(&hauppauge_hvr1100_config,
diff --git a/trunk/drivers/media/video/cx88/cx88.h b/trunk/drivers/media/video/cx88/cx88.h
index 5df6e41852bd..46a21f8f79ef 100644
--- a/trunk/drivers/media/video/cx88/cx88.h
+++ b/trunk/drivers/media/video/cx88/cx88.h
@@ -192,7 +192,8 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_PCHDTV_HD5500           47
 #define CX88_BOARD_KWORLD_MCE200_DELUXE    48
 #define CX88_BOARD_PIXELVIEW_PLAYTV_P7000  49
-#define CX88_BOARD_NPGTECH_REALTV  50
+#define CX88_BOARD_NPGTECH_REALTV          50
+#define CX88_BOARD_WINFAST_DTV2000H        51
 
 enum cx88_itype {
 	CX88_VMUX_COMPOSITE1 = 1,