From patchwork Mon Dec  7 02:00:03 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "Igor M. Liplianin" <liplianin@me.by>
X-Patchwork-Id: 65382
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nB720SNZ016462
	for <patchwork-media@patchwork.kernel.org>;
	Mon, 7 Dec 2009 02:00:28 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758176AbZLGCAF (ORCPT
	<rfc822;patchwork-media@patchwork.kernel.org>);
	Sun, 6 Dec 2009 21:00:05 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758021AbZLGCAF
	(ORCPT <rfc822;linux-media-outgoing>);
	Sun, 6 Dec 2009 21:00:05 -0500
Received: from mail-bw0-f227.google.com ([209.85.218.227]:43307 "EHLO
	mail-bw0-f227.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1756639AbZLGCAE (ORCPT
	<rfc822; linux-media@vger.kernel.org>); Sun, 6 Dec 2009 21:00:04 -0500
Received: by bwz27 with SMTP id 27so3176765bwz.21
	for <linux-media@vger.kernel.org>;
	Sun, 06 Dec 2009 18:00:09 -0800 (PST)
Received: by 10.204.25.67 with SMTP id y3mr3966473bkb.187.1260151208457;
	Sun, 06 Dec 2009 18:00:08 -0800 (PST)
Received: from useri.localnet ([212.98.173.132])
	by mx.google.com with ESMTPS id 14sm1451213bwz.1.2009.12.06.18.00.07
	(version=SSLv3 cipher=RC4-MD5);
	Sun, 06 Dec 2009 18:00:08 -0800 (PST)
From: "Igor M. Liplianin" <liplianin@me.by>
To: linux-media@vger.kernel.org, Steven Toth <stoth@linuxtv.org>
Subject: Success for Compro E650F analog television and alsa sound.
Date: Mon, 7 Dec 2009 04:00:03 +0200
User-Agent: KMail/1.11.4 (Linux/2.6.32-rc7; KDE/4.2.4; i686; ; )
MIME-Version: 1.0
Content-Disposition: inline
Message-Id: <200912070400.03469.liplianin@me.by>
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org


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",