From patchwork Fri Nov 12 14:51:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anca Emanuel X-Patchwork-Id: 319952 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oACEq1Br031085 for ; Fri, 12 Nov 2010 14:52:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932323Ab0KLOv5 (ORCPT ); Fri, 12 Nov 2010 09:51:57 -0500 Received: from mail-qw0-f46.google.com ([209.85.216.46]:36305 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932201Ab0KLOv4 (ORCPT ); Fri, 12 Nov 2010 09:51:56 -0500 Received: by qwd7 with SMTP id 7so165835qwd.19 for ; Fri, 12 Nov 2010 06:51:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:date:message-id :subject:from:to:cc:content-type; bh=qiNlW0X7xr2uyQpWFBrfnLoUZt4v4irbHGOt8slIn1o=; b=Q2W7LWXh3TJyUjrRkdEk/gD1Lgfdh3/eu1mWkFmF7TRIySUo8xNAqLBcPAZbRryZun 6ECXZJocYRdmjhpCyXNuW9Wm7WZSejix8tVPz97BLmj613YK0rvEuoZtVMgpeFYPPKDp iV16WkrlqW5wMBMG3yjGWVtpwiPzb0T0QifJo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=kuvVolay/ivJMSUBwUlWliFSpLDvoJRqTptteIj5Bxog/JAzNIBvF/GDIda3mrtwzg aYel/tAjStTfpshuGxyQBijVU74+6ytwOuq1HXi2q7LtbFn0U4ziBlM7+pqgwU+mpsLw DkS8yCCTsi2Et5xbuNlzihfp684BCGHLPptgY= MIME-Version: 1.0 Received: by 10.229.182.147 with SMTP id cc19mr1985858qcb.265.1289573514632; Fri, 12 Nov 2010 06:51:54 -0800 (PST) Received: by 10.229.247.66 with HTTP; Fri, 12 Nov 2010 06:51:54 -0800 (PST) Date: Fri, 12 Nov 2010 16:51:54 +0200 Message-ID: Subject: Leadtek WinFast PxPVR2200 From: Anca Emanuel To: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab , Andy Walls , "David T. L. Wong" , Michael Krufky , Laurent Pinchart , Douglas Schilling Landgraf , "Hans J. Koch" , Jiri Kosina 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 (demeter1.kernel.org [140.211.167.41]); Fri, 12 Nov 2010 14:52:03 +0000 (UTC) diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/c index db05400..d42145d 100644 --- a/drivers/media/video/cx23885/cx23885-cards.c +++ b/drivers/media/video/cx23885/cx23885-cards.c @@ -309,6 +309,12 @@ struct cx23885_board cx23885_boards[] = { CX25840_COMPONENT_ON, } }, }, + [CX23885_BOARD_LEADTEK_WINFAST_PXTV2200] = { + .name = "LEADTEK WinFast PxTV2200", + .porta = CX23885_ANALOG_VIDEO, + .tuner_type = TUNER_XC2028, + .tuner_addr = 0x64, + }, }; const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards); @@ -496,6 +502,10 @@ struct cx23885_subid cx23885_subids[] = { .subvendor = 0x107d, .subdevice = 0x6f22, .card = CX23885_BOARD_LEADTEK_WINFAST_PXTV1200, + }, { + .subvendor = 0x107d, + .subdevice = 0x6f21, + .card = CX23885_BOARD_LEADTEK_WINFAST_PXTV2200, }, }; const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids); @@ -749,6 +759,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev) cx_set(GP0_IO, 0x00050005); /* Bring the part out of reset */ break; case CX23885_BOARD_HAUPPAUGE_HVR1800: + case CX23885_BOARD_LEADTEK_WINFAST_PXTV2200: /* GPIO-0 656_CLK */ /* GPIO-0 656_CLK */ /* GPIO-1 656_D0 */ /* GPIO-2 8295A Reset */ diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885 index ed94b17..c2fce8c 100644 --- a/drivers/media/video/cx23885/cx23885.h +++ b/drivers/media/video/cx23885/cx23885.h @@ -84,6 +84,7 @@ #define CX23885_BOARD_HAUPPAUGE_HVR1290 26 #define CX23885_BOARD_MYGICA_X8558PRO 27 #define CX23885_BOARD_LEADTEK_WINFAST_PXTV1200 28 +#define CX23885_BOARD_LEADTEK_WINFAST_PXTV2200 29 #define GPIO_0 0x00000001 #define GPIO_1 0x00000002