From patchwork Tue Apr 6 04:00:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitri Belimov X-Patchwork-Id: 90732 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o363wOke028149 for ; Tue, 6 Apr 2010 03:58:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754369Ab0DFD6M (ORCPT ); Mon, 5 Apr 2010 23:58:12 -0400 Received: from mail-ew0-f220.google.com ([209.85.219.220]:41629 "EHLO mail-ew0-f220.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751851Ab0DFD6M (ORCPT ); Mon, 5 Apr 2010 23:58:12 -0400 Received: by ewy20 with SMTP id 20so265556ewy.1 for ; Mon, 05 Apr 2010 20:58:10 -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:subject :message-id:x-mailer:mime-version:content-type :content-transfer-encoding; bh=DZXyLbfFSoHA1mVtPotwJu9P3+4n/zryD3b94p5TB+g=; b=nM9Tn/+bRzX6XWF8QnC71E5M+baDZvWav31C2dIQvwNnTkdxH1FYajmjc9SblzQdLn 7w0Vb3iHXIAyEPTuQFEoH20ezc5UHv3jUQvZ6xe3y8p3xjcUVgHn7ISdNzSqb0e9Mu/C XUs5AEJL1Zg0z1K6pLAPCwnBw9dU8gfzAnZ8U= 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 :content-transfer-encoding; b=dvzYH0lj3JN3VpYQm1I0ffO7kclrbfdrRyrOAgtYmgVmCsJcNifw1cMYCkC553YDy3 lUfvw0w+7tAFBrVS5M3wySTWZOK2NBKj6y8S6IY3JR9X3dj3+RXZo4oRNJNGUTpOWCW0 2MHaaWLn55bX3F164QEjD05IrCDHD7PswJZzM= Received: by 10.213.58.141 with SMTP id g13mr229378ebh.12.1270526289997; Mon, 05 Apr 2010 20:58:09 -0700 (PDT) Received: from glory.loctelecom.ru (ns2.openhardware.ru [84.19.183.172]) by mx.google.com with ESMTPS id 13sm6728046ewy.9.2010.04.05.20.58.08 (version=SSLv3 cipher=RC4-MD5); Mon, 05 Apr 2010 20:58:09 -0700 (PDT) Date: Tue, 6 Apr 2010 14:00:05 +1000 From: Dmitri Belimov To: linux-media@vger.kernel.org, Mauro Carvalho Chehab Subject: [PATCH] Add support new TV cards Message-ID: <20100406140005.49505a01@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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 06 Apr 2010 03:58:25 +0000 (UTC) diff -r 4ee1e97ba6ad linux/drivers/media/video/saa7134/saa7134-cards.c --- a/linux/drivers/media/video/saa7134/saa7134-cards.c Sun Apr 04 20:58:13 2010 -0400 +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c Tue Apr 06 13:51:11 2010 +1000 @@ -5411,6 +5411,62 @@ .gpio = 0x389c00, } }, }, + [SAA7134_BOARD_BEHOLD_H7] = { + /* Beholder Intl. Ltd. Dmitry Belimov */ + .name = "Beholder BeholdTV H7", + .audio_clock = 0x00187de7, + .tuner_type = TUNER_XC5000, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .mpeg = SAA7134_MPEG_DVB, + .ts_type = SAA7134_MPEG_TS_PARALLEL, + .inputs = { { + .name = name_tv, + .vmux = 2, + .amux = TV, + .tv = 1, + }, { + .name = name_comp1, + .vmux = 0, + .amux = LINE1, + }, { + .name = name_svideo, + .vmux = 9, + .amux = LINE1, + } }, + .radio = { + .name = name_radio, + .amux = TV, + }, + }, + [SAA7134_BOARD_BEHOLD_A7] = { + /* Beholder Intl. Ltd. Dmitry Belimov */ + .name = "Beholder BeholdTV A7", + .audio_clock = 0x00187de7, + .tuner_type = TUNER_XC5000, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .inputs = { { + .name = name_tv, + .vmux = 2, + .amux = TV, + .tv = 1, + }, { + .name = name_comp1, + .vmux = 0, + .amux = LINE1, + }, { + .name = name_svideo, + .vmux = 9, + .amux = LINE1, + } }, + .radio = { + .name = name_radio, + .amux = TV, + }, + }, }; @@ -6605,6 +6661,18 @@ .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, .driver_data = SAA7134_BOARD_UNKNOWN, + }, { + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x5ace, /* Beholder Intl. Ltd. */ + .subdevice = 0x7190, + .driver_data = SAA7134_BOARD_BEHOLD_H7, + }, { + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x5ace, /* Beholder Intl. Ltd. */ + .subdevice = 0x7090, + .driver_data = SAA7134_BOARD_BEHOLD_A7, },{ /* --- end of list --- */ } @@ -6696,6 +6764,8 @@ { switch (dev->board) { case SAA7134_BOARD_BEHOLD_X7: + case SAA7134_BOARD_BEHOLD_H7: + case SAA7134_BOARD_BEHOLD_A7: if (command == XC5000_TUNER_RESET) { /* Down and UP pheripherial RESET pin for reset all chips */ saa_writeb(SAA7134_SPECIAL_MODE, 0x00); @@ -7074,6 +7144,8 @@ case SAA7134_BOARD_BEHOLD_M6_EXTRA: case SAA7134_BOARD_BEHOLD_H6: case SAA7134_BOARD_BEHOLD_X7: + case SAA7134_BOARD_BEHOLD_H7: + case SAA7134_BOARD_BEHOLD_A7: dev->has_remote = SAA7134_REMOTE_I2C; break; case SAA7134_BOARD_AVERMEDIA_A169_B: diff -r 4ee1e97ba6ad linux/drivers/media/video/saa7134/saa7134-dvb.c --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c Sun Apr 04 20:58:13 2010 -0400 +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c Tue Apr 06 13:51:11 2010 +1000 @@ -1537,6 +1537,15 @@ &dev->i2c_adap, &behold_x7_tunerconfig); } break; + case SAA7134_BOARD_BEHOLD_H7: + fe0->dvb.frontend = dvb_attach(zl10353_attach, + &behold_x7_config, + &dev->i2c_adap); + if (fe0->dvb.frontend) { + dvb_attach(xc5000_attach, fe0->dvb.frontend, + &dev->i2c_adap, &behold_x7_tunerconfig); + } + break; case SAA7134_BOARD_AVERMEDIA_A700_PRO: case SAA7134_BOARD_AVERMEDIA_A700_HYBRID: /* Zarlink ZL10313 */ diff -r 4ee1e97ba6ad linux/drivers/media/video/saa7134/saa7134-input.c --- a/linux/drivers/media/video/saa7134/saa7134-input.c Sun Apr 04 20:58:13 2010 -0400 +++ b/linux/drivers/media/video/saa7134/saa7134-input.c Tue Apr 06 13:51:11 2010 +1000 @@ -942,6 +942,8 @@ case SAA7134_BOARD_BEHOLD_M6_EXTRA: case SAA7134_BOARD_BEHOLD_H6: case SAA7134_BOARD_BEHOLD_X7: + case SAA7134_BOARD_BEHOLD_H7: + case SAA7134_BOARD_BEHOLD_A7: #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30) snprintf(ir->c.name, sizeof(ir->c.name), "BeholdTV"); ir->get_key = get_key_beholdm6xx; diff -r 4ee1e97ba6ad linux/drivers/media/video/saa7134/saa7134.h --- a/linux/drivers/media/video/saa7134/saa7134.h Sun Apr 04 20:58:13 2010 -0400 +++ b/linux/drivers/media/video/saa7134/saa7134.h Tue Apr 06 13:51:11 2010 +1000 @@ -302,6 +302,8 @@ #define SAA7134_BOARD_LEADTEK_WINFAST_DTV1000S 175 #define SAA7134_BOARD_BEHOLD_505RDS_MK3 176 #define SAA7134_BOARD_HAWELL_HW_404M7 177 +#define SAA7134_BOARD_BEHOLD_H7 178 +#define SAA7134_BOARD_BEHOLD_A7 179 #define SAA7134_MAXBOARDS 32 #define SAA7134_INPUT_MAX 8