From dc11fd9b880618b1ad528710c56bd7913971cdf0 Mon Sep 17 00:00:00 2001
From: "Nickolay V. Shmyrev" <devnull@localhost>
Date: Wed, 4 Jan 2006 11:20:42 +0000
Subject: Add Kworld/Vstream Xpert DVB-T card with cx22702 tuner. From: Manenti
 Marco <marco_manenti@colman.it>

	* linux/Documentation/video4linux/CARDLIST.cx88:
	* linux/drivers/media/video/cx88/cx88-cards.c:
	* linux/drivers/media/video/cx88/cx88-dvb.c: (dvb_register):
	* linux/drivers/media/video/cx88/cx88.h:

	Add Kworld/Vstream Xpert DVB-T card with cx22702 tuner.

Signed-off-by: Manenti Marco <marco_manenti@colman.it>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
---
 linux/drivers/media/video/cx88/cx88-cards.c | 31 +++++++++++++++++++++++++++--
 linux/drivers/media/video/cx88/cx88-dvb.c   |  3 ++-
 linux/drivers/media/video/cx88/cx88.h       |  3 ++-
 3 files changed, 33 insertions(+), 4 deletions(-)

(limited to 'linux/drivers')

diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index cf13b83a4..1d3ea1d11 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-cards.c,v 1.115 2005/12/23 13:01:27 mchehab Exp $
+ * $Id: cx88-cards.c,v 1.116 2006/01/04 11:20:42 nsh Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * card-specific stuff.
@@ -1011,6 +1011,29 @@ struct cx88_board cx88_boards[] = {
 		},
 		.dvb            = 1,
 	},
+	[CX88_BOARD_KWORLD_DVB_T_CX22702] = {
+		/* Kworld V-stream Xpert DVB-T with Thomson tuner */
+		/* DTT 7579 Conexant CX22702-19 Conexant CX2388x  */
+		/* Manenti Marco <marco_manenti@colman.it> */
+		.name           = "KWorld/VStream XPert DVB-T with cx22702",
+		.tuner_type     = TUNER_ABSENT,
+		.radio_type     = UNSET,
+		.tuner_addr	= ADDR_UNSET,
+		.radio_addr	= ADDR_UNSET,
+		.input          = {{
+			.type   = CX88_VMUX_COMPOSITE1,
+			.vmux   = 1,
+			.gpio0  = 0x0700,
+			.gpio2  = 0x0101,
+		},{
+			.type   = CX88_VMUX_SVIDEO,
+			.vmux   = 2,
+			.gpio0  = 0x0700,
+			.gpio2  = 0x0101,
+		}},
+		.dvb            = 1,
+	},
+
 };
 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
 
@@ -1198,7 +1221,11 @@ struct cx88_subid cx88_subids[] = {
 		.subvendor = 0x1822,
 		.subdevice = 0x0025,
 		.card      = CX88_BOARD_DNTV_LIVE_DVB_T_PRO,
-	},
+	},{
+	       .subvendor = 0x17de,
+	       .subdevice = 0x08a1,
+	       .card      = CX88_BOARD_KWORLD_DVB_T_CX22702,
+       }
 };
 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
 
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c
index ad5aa8e1f..d8b245ba1 100644
--- a/linux/drivers/media/video/cx88/cx88-dvb.c
+++ b/linux/drivers/media/video/cx88/cx88-dvb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-dvb.c,v 1.79 2006/01/01 17:17:39 mchehab Exp $
+ * $Id: cx88-dvb.c,v 1.80 2006/01/04 11:20:42 nsh Exp $
  *
  * device driver for Conexant 2388x based TV cards
  * MPEG Transport Stream (DVB) routines
@@ -441,6 +441,7 @@ static int dvb_register(struct cx8802_dev *dev)
 		break;
 	case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
 	case CX88_BOARD_CONEXANT_DVB_T1:
+	case CX88_BOARD_KWORLD_DVB_T_CX22702:
 	case CX88_BOARD_WINFAST_DTV1000:
 		dev->dvb.frontend = cx22702_attach(&connexant_refboard_config,
 						   &dev->core->i2c_adap);
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index de522cf33..6497c6db7 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88.h,v 1.96 2006/01/01 17:17:39 mchehab Exp $
+ * $Id: cx88.h,v 1.97 2006/01/04 11:20:42 nsh Exp $
  *
  * v4l2 device driver for cx2388x based TV cards
  *
@@ -192,6 +192,7 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_HAUPPAUGE_HVR1100       40
 #define CX88_BOARD_HAUPPAUGE_HVR1100LP     41
 #define CX88_BOARD_DNTV_LIVE_DVB_T_PRO     42
+#define CX88_BOARD_KWORLD_DVB_T_CX22702    43
 
 enum cx88_itype {
 	CX88_VMUX_COMPOSITE1 = 1,
-- 
cgit v1.2.3