Success for Compro E650F analog television and alsa sound.

Commit Message

Igor M. Liplianin Dec. 7, 2009, 2 a.m. UTC

None

Patch

diff -r 121066e283e5 linux/drivers/media/video/cx23885/Kconfig
--- a/linux/drivers/media/video/cx23885/Kconfig	Sun Dec 06 09:32:49 2009 -0200
+++ b/linux/drivers/media/video/cx23885/Kconfig	Mon Dec 07 03:48:12 2009 +0200
@@ -1,6 +1,7 @@ 
 config VIDEO_CX23885
 	tristate "Conexant cx23885 (2388x successor) support"
-	depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT
+	depends on DVB_CORE && VIDEO_DEV && PCI && I2C && INPUT && SND
+	select SND_PCM
 	select I2C_ALGOBIT
 	select VIDEO_BTCX
 	select VIDEO_TUNER
diff -r 121066e283e5 linux/drivers/media/video/cx23885/cx23885-cards.c
--- a/linux/drivers/media/video/cx23885/cx23885-cards.c	Sun Dec 06 09:32:49 2009 -0200
+++ b/linux/drivers/media/video/cx23885/cx23885-cards.c	Mon Dec 07 03:48:12 2009 +0200
@@ -163,7 +163,29 @@ 
 	},
 	[CX23885_BOARD_COMPRO_VIDEOMATE_E650F] = {
 		.name		= "Compro VideoMate E650F",
+		.porta		= CX23885_ANALOG_VIDEO,
 		.portc		= CX23885_MPEG_DVB,
+		.tuner_type	= TUNER_XC2028,
+		.tuner_addr	= 0x61,
+		.input		= {
+			{
+				.type   = CX23885_VMUX_TELEVISION,
+				.vmux   = CX25840_COMPOSITE2,
+			}, {
+				.type   = CX23885_VMUX_COMPOSITE1,
+				.vmux   = CX25840_COMPOSITE8,
+			}, {
+				.type   = CX23885_VMUX_SVIDEO,
+				.vmux   = CX25840_SVIDEO_LUMA3 |
+					CX25840_SVIDEO_CHROMA4,
+			}, {
+				.type   = CX23885_VMUX_COMPONENT,
+				.vmux   = CX25840_COMPONENT_ON |
+					CX25840_VIN1_CH1 |
+					CX25840_VIN6_CH2 |
+					CX25840_VIN7_CH3,
+			},
+		},
 	},
 	[CX23885_BOARD_TBS_6920] = {
 		.name		= "TurboSight TBS 6920",