From patchwork Tue Nov 10 04:37:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitri Belimov X-Patchwork-Id: 58959 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 nAA5ZD0Y031900 for ; Tue, 10 Nov 2009 05:35:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751268AbZKJFfG (ORCPT ); Tue, 10 Nov 2009 00:35:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751300AbZKJFfG (ORCPT ); Tue, 10 Nov 2009 00:35:06 -0500 Received: from fg-out-1718.google.com ([72.14.220.158]:5768 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750918AbZKJFfE (ORCPT ); Tue, 10 Nov 2009 00:35:04 -0500 Received: by fg-out-1718.google.com with SMTP id e12so1515508fga.1 for ; Mon, 09 Nov 2009 21:35:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:x-mailer:mime-version:content-type; bh=j6i/+X/842xEyoYoOWgU0LdXs3rFXXmmcXLbbYSws64=; b=qANI5QgC7mFaM5AixfWmf0HB3W369yjLUesMVZlRfbvhKvygI2dCctlRT5MHVK33Ea CWSn3XNR2MMQIWfEFA9XuLEZOFRVADWB9ZWO9chQoug5ebndn65L3lXl5xHyC/2VqNz/ BAVH7ZPGjUIqxinHlvsROK+NTnpXjmNAFgw4Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:x-mailer:mime-version:content-type; b=yHC1+atxOhDxCqdyrwcit1K6/xPdyJjOHRf725joCEflCBu52QwXFd64FcNpqu4AuJ 8ddYbYC4K1MwLkeUttZo3VmEiKm4g2uaAJYD/qLpX7n+YkKDkLSJIFDOIvcvU78laDq3 LUdLAZTXmRezA/Z8nzYHrJVpk/6ynW3J12Vl4= Received: by 10.86.13.37 with SMTP id 37mr1474754fgm.58.1257831308807; Mon, 09 Nov 2009 21:35:08 -0800 (PST) Received: from glory.loctelecom.ru (ns2.openhardware.ru [84.19.183.172]) by mx.google.com with ESMTPS id e3sm898544fga.23.2009.11.09.21.35.06 (version=SSLv3 cipher=RC4-MD5); Mon, 09 Nov 2009 21:35:08 -0800 (PST) Date: Tue, 10 Nov 2009 13:37:43 +0900 From: Dmitri Belimov To: linux-media@vger.kernel.org, video4linux-list@redhat.com Subject: [PATCH] Add new TV cards of Beholder Message-ID: <20091110133743.21cb7dc5@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 diff -r 3919b17dc88e linux/drivers/staging/tm6000/tm6000-cards.c --- a/linux/drivers/staging/tm6000/tm6000-cards.c Wed Oct 14 12:52:55 2009 -0300 +++ b/linux/drivers/staging/tm6000/tm6000-cards.c Tue Nov 10 08:05:15 2009 +0900 @@ -33,6 +33,7 @@ #include "tm6000.h" #include "tm6000-regs.h" #include "tuner-xc2028.h" +#include "tuner-xc5000.h" #define TM6000_BOARD_UNKNOWN 0 #define TM5600_BOARD_GENERIC 1 @@ -193,6 +194,36 @@ }, .gpio_addr_tun_reset = TM6000_GPIO_2, }, + [TM6010_BOARD_BEHOLD_WANDER] = { + .name = "Beholder Wander DVB-T/TV/FM USB2.0", + .tuner_type = TUNER_XC5000, + .tuner_addr = 0xc2 >> 1, + .demod_addr = 0x1e >> 1, + .type = TM6010, + .caps = { + .has_tuner = 1, + .has_dvb = 1, + .has_zl10353 = 1, + .has_eeprom = 1, + .has_remote = 1, + }, + .gpio_addr_tun_reset = TM6000_GPIO_2, + }, + [TM6010_BOARD_BEHOLD_VOYAGER] = { + .name = "Beholder Voyager TV/FM USB2.0", + .tuner_type = TUNER_XC5000, + .tuner_addr = 0xc2 >> 1, + .type = TM6010, + .caps = { + .has_tuner = 1, + .has_dvb = 0, + .has_zl10353 = 0, + .has_eeprom = 1, + .has_remote = 1, + }, + .gpio_addr_tun_reset = TM6000_GPIO_2, + }, + }; /* table of devices that work with this driver */ @@ -203,6 +234,8 @@ { USB_DEVICE(0x14aa, 0x0620), .driver_info = TM6000_BOARD_FREECOM_AND_SIMILAR }, { USB_DEVICE(0x06e1, 0xb339), .driver_info = TM6000_BOARD_ADSTECH_MINI_DUAL_TV }, { USB_DEVICE(0x2040, 0x6600), .driver_info = TM6010_BOARD_HAUPPAUGE_900H }, + { USB_DEVICE(0x6000, 0xdec0), .driver_info = TM6010_BOARD_BEHOLD_WANDER }, + { USB_DEVICE(0x6000, 0xdec1), .driver_info = TM6010_BOARD_BEHOLD_VOYAGER }, { }, }; Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov