From patchwork Mon Dec 21 05:00:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitri Belimov X-Patchwork-Id: 69078 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBL4uK2l016738 for ; Mon, 21 Dec 2009 04:56:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752923AbZLUE4U (ORCPT ); Sun, 20 Dec 2009 23:56:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753086AbZLUE4U (ORCPT ); Sun, 20 Dec 2009 23:56:20 -0500 Received: from mail-bw0-f227.google.com ([209.85.218.227]:37813 "EHLO mail-bw0-f227.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750890AbZLUE4T (ORCPT ); Sun, 20 Dec 2009 23:56:19 -0500 Received: by bwz27 with SMTP id 27so3240304bwz.21 for ; Sun, 20 Dec 2009 20:56:17 -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=CUb8hrzg81+N3nkuXYyY/4/YqOHO2bHurdd6vrS1tVI=; b=NRSod9D4OLTv8/Ekos6S7sassOUmLUXAMAaxPvqEDsTbwo81H2N3UbNKeJb3BQMR0X oIFtcoICpDHXr8dX+BxgimZLzV13y6WGHCwp1qNj4soQpKOHPIvnO8BC+Gobg71gW1aX eWNpzypJ+GrhzaSKpeOMpxu80cOXcSOMBAwm0= 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=I80ld+RHSlBk2ZKFT5u1i8NWwTJN9gVzQfoX4lehIehUZyw8whcWbhCX9z1tFw0Hrm EVFvFbCz2wslMSkMmz4nrwT1kKl6vQlO190PuYNbUDHXEgOkb5sctAPmF9F03rC+0nDD TxNXtM8p27eETKatFN1uJ2HV84NFSnqp63a/g= Received: by 10.204.154.69 with SMTP id n5mr202841bkw.43.1261371377209; Sun, 20 Dec 2009 20:56:17 -0800 (PST) Received: from glory.loctelecom.ru (ns2.openhardware.ru [84.19.183.172]) by mx.google.com with ESMTPS id 13sm1478782bwz.14.2009.12.20.20.56.14 (version=SSLv3 cipher=RC4-MD5); Sun, 20 Dec 2009 20:56:16 -0800 (PST) Date: Mon, 21 Dec 2009 14:00:38 +0900 From: Dmitri Belimov To: linux-media@vger.kernel.org, video4linux-list@redhat.com Subject: [PATCH] Add lost config and PCI ID for card of Beholder Message-ID: <20091221140038.18ab7b24@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 79fc32bba0a0 linux/drivers/media/video/saa7134/saa7134-cards.c --- a/linux/drivers/media/video/saa7134/saa7134-cards.c Mon Dec 14 17:43:13 2009 -0200 +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c Wed Dec 16 11:02:53 2009 +0900 @@ -4199,7 +4199,7 @@ .amux = LINE2, }, }, - [SAA7134_BOARD_BEHOLD_505RDS] = { + [SAA7134_BOARD_BEHOLD_505RDS_MK5] = { /* Beholder Intl. Ltd. 2008 */ /*Dmitry Belimov */ .name = "Beholder BeholdTV 505 RDS", @@ -5359,6 +5359,41 @@ .vmux = 8, } }, }, + [SAA7134_BOARD_BEHOLD_505RDS_MK3] = { + /* Beholder Intl. Ltd. 2008 */ + /*Dmitry Belimov */ + .name = "Beholder BeholdTV 505 RDS", + .audio_clock = 0x00200000, + .tuner_type = TUNER_PHILIPS_FM1216ME_MK3, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .rds_addr = 0x10, + .tda9887_conf = TDA9887_PRESENT, + .gpiomask = 0x00008000, + .inputs = {{ + .name = name_tv, + .vmux = 3, + .amux = LINE2, + .tv = 1, + }, { + .name = name_comp1, + .vmux = 1, + .amux = LINE1, + }, { + .name = name_svideo, + .vmux = 8, + .amux = LINE1, + } }, + .mute = { + .name = name_mute, + .amux = LINE1, + }, + .radio = { + .name = name_radio, + .amux = LINE2, + }, + }, }; @@ -6274,7 +6309,13 @@ .device = PCI_DEVICE_ID_PHILIPS_SAA7130, .subvendor = 0x0000, .subdevice = 0x505B, - .driver_data = SAA7134_BOARD_BEHOLD_505RDS, + .driver_data = SAA7134_BOARD_BEHOLD_505RDS_MK5, + }, { + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7130, + .subvendor = 0x0000, + .subdevice = 0x5051, + .driver_data = SAA7134_BOARD_BEHOLD_505RDS_MK3, },{ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7130, @@ -6872,7 +6913,8 @@ case SAA7134_BOARD_BEHOLD_407FM: case SAA7134_BOARD_BEHOLD_409: case SAA7134_BOARD_BEHOLD_505FM: - case SAA7134_BOARD_BEHOLD_505RDS: + case SAA7134_BOARD_BEHOLD_505RDS_MK5: + case SAA7134_BOARD_BEHOLD_505RDS_MK3: case SAA7134_BOARD_BEHOLD_507_9FM: case SAA7134_BOARD_BEHOLD_507RDS_MK3: case SAA7134_BOARD_BEHOLD_507RDS_MK5: diff -r 79fc32bba0a0 linux/drivers/media/video/saa7134/saa7134-input.c --- a/linux/drivers/media/video/saa7134/saa7134-input.c Mon Dec 14 17:43:13 2009 -0200 +++ b/linux/drivers/media/video/saa7134/saa7134-input.c Wed Dec 16 11:02:53 2009 +0900 @@ -625,7 +625,8 @@ case SAA7134_BOARD_BEHOLD_407FM: case SAA7134_BOARD_BEHOLD_409: case SAA7134_BOARD_BEHOLD_505FM: - case SAA7134_BOARD_BEHOLD_505RDS: + case SAA7134_BOARD_BEHOLD_505RDS_MK5: + case SAA7134_BOARD_BEHOLD_505RDS_MK3: case SAA7134_BOARD_BEHOLD_507_9FM: case SAA7134_BOARD_BEHOLD_507RDS_MK3: case SAA7134_BOARD_BEHOLD_507RDS_MK5: diff -r 79fc32bba0a0 linux/drivers/media/video/saa7134/saa7134.h --- a/linux/drivers/media/video/saa7134/saa7134.h Mon Dec 14 17:43:13 2009 -0200 +++ b/linux/drivers/media/video/saa7134/saa7134.h Wed Dec 16 11:02:53 2009 +0900 @@ -283,7 +283,7 @@ #define SAA7134_BOARD_HAUPPAUGE_HVR1120 156 #define SAA7134_BOARD_AVERMEDIA_STUDIO_507UA 157 #define SAA7134_BOARD_AVERMEDIA_CARDBUS_501 158 -#define SAA7134_BOARD_BEHOLD_505RDS 159 +#define SAA7134_BOARD_BEHOLD_505RDS_MK5 159 #define SAA7134_BOARD_BEHOLD_507RDS_MK3 160 #define SAA7134_BOARD_BEHOLD_507RDS_MK5 161 #define SAA7134_BOARD_BEHOLD_607FM_MK5 162 @@ -300,6 +300,7 @@ #define SAA7134_BOARD_ZOLID_HYBRID_PCI 173 #define SAA7134_BOARD_ASUS_EUROPA_HYBRID 174 #define SAA7134_BOARD_LEADTEK_WINFAST_DTV1000S 175 +#define SAA7134_BOARD_BEHOLD_505RDS_MK3 176 #define SAA7134_MAXBOARDS 32 #define SAA7134_INPUT_MAX 8 Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov