From patchwork Wed May 26 04:52:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitri Belimov X-Patchwork-Id: 3493 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Wed, 26 May 2010 04:51:50 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for (single-drop); Wed, 26 May 2010 11:34:59 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1OH8ar-0002P2-P8; Wed, 26 May 2010 04:51:50 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750923Ab0EZEvr (ORCPT + 1 other); Wed, 26 May 2010 00:51:47 -0400 Received: from fg-out-1718.google.com ([72.14.220.153]:19876 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750850Ab0EZEvq (ORCPT ); Wed, 26 May 2010 00:51:46 -0400 Received: by fg-out-1718.google.com with SMTP id e12so615426fga.1 for ; Tue, 25 May 2010 21:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:in-reply-to:references:x-mailer:mime-version :content-type; bh=e2rVsOrxnqnvK5fzyMJkBvHnPIP07Jc9F+fdMeFr+Sg=; b=r6fHFDcSeGVHLhNZKvkuPb1GAzorsLl3Gb8Cv5IppgeQ13gFvP1YdJ/yXKYgV0dX+M htLutpLCClscTV6outUeWcxm5gcAI0TMFNYhvHBVjowOzDeLKVEqTjZiZctZ5lZzG1Gx hZTuLZmXj9GJXmA9Klf34l1DOY1FRLWcxgiyg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type; b=MPZH3InPa9jo+saUb9e0jNIw0+Uju27tXmFnSstlip/+6Tq+xTfhRUtNb/hRV9fZ92 arBJ7A55K8Xi8xiwqkBPZNf/5wfpI+BeO9IzbVl+nSjGE2w2ZJrRtCmh+ndFtfKzO/N/ 5dSPtxs4tz8v14NEG2+NFC9SDgWAFh06heLek= Received: by 10.204.13.68 with SMTP id b4mr3381799bka.133.1274849505202; Tue, 25 May 2010 21:51:45 -0700 (PDT) Received: from glory.loctelecom.ru (ns2.openhardware.ru [84.19.183.172]) by mx.google.com with ESMTPS id r38sm4868292bkk.3.2010.05.25.21.51.42 (version=SSLv3 cipher=RC4-MD5); Tue, 25 May 2010 21:51:44 -0700 (PDT) Date: Wed, 26 May 2010 14:52:19 +1000 From: Dmitri Belimov To: Luis Henrique Fagundes Cc: Linux Media Mailing List , Stefan Ringel , Mauro Carvalho Chehab , Bee Hock Goh Subject: tm6000, alsa Message-ID: <20100526145219.11c81de0@glory.loctelecom.ru> In-Reply-To: <20100518172329.6d9b520a@glory.loctelecom.ru> References: <20100518172329.6d9b520a@glory.loctelecom.ru> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.16.1; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Patches for review. Add new data structure list_head for many tm6000 cards. Rework tm6000-alsa. Comment some old code befor remove. Now tm6000-alsa not load when tm6000 start. Need load tm6000-alsa manualy [ 210.777562] tm6000: New video device @ 480 Mbps (6000:dec0, ifnum 0) [ 210.777566] tm6000: Found Beholder Wander DVB-T/TV/FM USB2.0 [ 211.700009] Board version = 0x67980bf4 [ 211.900011] board=0x67980bf4 [ 212.024512] tm6000 #0: i2c eeprom 00: 42 59 54 45 12 01 00 02 00 00 00 40 00 60 c0 de BYTE.......@.`.. [ 212.216012] tm6000 #0: i2c eeprom 10: 01 00 10 20 40 01 28 03 42 00 65 00 68 00 6f 00 ... @.(.B.e.h.o. [ 212.408012] tm6000 #0: i2c eeprom 20: 6c 00 64 00 65 00 72 00 20 00 49 00 6e 00 74 00 l.d.e.r. .I.n.t. [ 212.600012] tm6000 #0: i2c eeprom 30: 6c 00 2e 00 20 00 4c 00 74 00 64 00 2e 00 ff ff l... .L.t.d..... [ 212.792012] tm6000 #0: i2c eeprom 40: 22 03 42 00 65 00 68 00 6f 00 6c 00 64 00 20 00 ".B.e.h.o.l.d. . [ 212.984012] tm6000 #0: i2c eeprom 50: 54 00 56 00 20 00 57 00 61 00 6e 00 64 00 65 00 T.V. .W.a.n.d.e. [ 213.176011] tm6000 #0: i2c eeprom 60: 72 00 ff ff ff ff ff ff ff ff 1a 03 56 00 69 00 r...........V.i. [ 213.368012] tm6000 #0: i2c eeprom 70: 64 00 65 00 6f 00 43 00 61 00 70 00 74 00 75 00 d.e.o.C.a.p.t.u. [ 213.560012] tm6000 #0: i2c eeprom 80: 72 00 65 00 ff ff ff ff ff ff ff ff ff ff ff ff r.e............. [ 213.752012] tm6000 #0: i2c eeprom 90: ff ff ff ff 16 03 30 00 30 00 30 00 30 00 30 00 ......0.0.0.0.0. [ 213.944011] tm6000 #0: i2c eeprom a0: 30 00 32 00 30 00 34 00 31 00 ff ff ff ff ff ff 0.2.0.4.1....... [ 214.136009] tm6000 #0: i2c eeprom b0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................ [ 214.328012] tm6000 #0: i2c eeprom c0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................ [ 214.520014] tm6000 #0: i2c eeprom d0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................ [ 214.712012] tm6000 #0: i2c eeprom e0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................ [ 214.904012] tm6000 #0: i2c eeprom f0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................ [ 215.084013] ................ [ 215.104890] tuner 1-0061: chip found @ 0xc2 (tm6000 #0) [ 215.160471] xc5000 1-0061: creating new instance [ 215.216511] xc5000: Successfully identified at address 0x61 [ 215.216515] xc5000: Firmware has not been loaded previously [ 215.216522] tuner 1-0061: Tuner frontend module has no way to set config [ 215.328012] xc5000: waiting for firmware upload (dvb-fe-xc5000-1.6.114.fw)... [ 215.328019] usb 1-1: firmware: requesting dvb-fe-xc5000-1.6.114.fw [ 215.365986] xc5000: firmware read 12401 bytes. [ 215.365989] xc5000: firmware uploading... [ 227.128008] xc5000: firmware upload complete... [ 229.036083] Trident TVMaster TM5600/TM6000/TM6010 USB2 board (Load status: 0) [ 229.036114] usbcore: registered new interface driver tm6000 [ 229.052288] tm6000: open called (dev=video0) [ 230.484571] Original value=255 load tm6000-alsa manualy [ 259.141425] tm6000 ALSA driver for DMA sound loaded unload tm6000-alsa [ 309.364210] tm6000 ALSA driver for DMA sound unloaded load tm6000-alsa manualy [ 320.118131] tm6000 ALSA driver for DMA sound loaded ALSA devices created arecord -l **** List of CAPTURE Hardware Devices **** card 0: Intel [HDA Intel], device 0: ALC883 Analog [ALC883 Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: Intel [HDA Intel], device 1: ALC883 Digital [ALC883 Digital] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: Intel [HDA Intel], device 2: ALC883 Analog [ALC883 Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: default [], device 0: tm6000 Digital [tm6000 Digital] Subdevices: 1/1 Subdevice #0: subdevice #0 If need I can rework this patches or it can be upload to tm6000 tree. With my best regards, Dmitry. diff -r 8f5129efe974 linux/drivers/staging/tm6000/tm6000.h --- a/linux/drivers/staging/tm6000/tm6000.h Sun May 16 18:48:01 2010 -0300 +++ b/linux/drivers/staging/tm6000/tm6000.h Wed May 26 08:38:12 2010 +1000 @@ -154,6 +154,7 @@ int model; /* index in the device_data struct */ int devno; /* marks the number of this device */ enum tm6000_devtype dev_type; /* type of device */ + struct list_head devlist; v4l2_std_id norm; /* Current norm */ int width,height; /* Selected resolution */ @@ -228,6 +229,8 @@ V4L2_STD_NTSC_M_JP|V4L2_STD_SECAM /* In tm6000-cards.c */ +extern struct list_head tm6000_devlist; +extern struct mutex tm6000_devlist_lock; int tm6000_tuner_callback (void *ptr, int component, int command, int arg); int tm6000_xc5000_callback (void *ptr, int component, int command, int arg); @@ -289,7 +294,7 @@ int tm6000_queue_init(struct tm6000_core *dev); /* In tm6000-alsa.c */ -int tm6000_audio_init(struct tm6000_core *dev, int idx); +//int tm6000_audio_init(struct tm6000_core *dev, int idx); /* Debug stuff */ Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov