From patchwork Fri Nov 12 22:31:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anca Emanuel X-Patchwork-Id: 321582 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 oACMVABO020385 for ; Fri, 12 Nov 2010 22:31:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932150Ab0KLWbH (ORCPT ); Fri, 12 Nov 2010 17:31:07 -0500 Received: from mail-qw0-f46.google.com ([209.85.216.46]:51404 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932096Ab0KLWbC (ORCPT ); Fri, 12 Nov 2010 17:31:02 -0500 Received: by qwi2 with SMTP id 2so287116qwi.19 for ; Fri, 12 Nov 2010 14:31:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=bMINxdHGUl+vDOeYjxkjHqzWTNhY0KMfg7nqSDMDUD8=; b=jOzp7ztbxEdu5IMhRMWoQeslB7BS7qmZbTKrOPg0qoJJlsNxYUXCfg5prY61Yz9495 E/qDvp2YvzLUpWmbf1X5nQn8zQMqVUl8PEkQ6FTliQhBo7FDVZEiVMlbLJm4AxKzOUML IFiUhYXOr4Vi41prea1dsQnbe/6QFsB0KFnvE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=ARY0Rn1U5bmcKyJz6FFql3e0wm5ikMKlN0uBpnMq27gm1kfBKF3o9u+OyNaT8Odi4B Gx/IAB4bteTbY095ypPmjcNECBT0W9abJTCdqd+Mp0or0qKI0vtME/KwUajOw1e9ki3s XI+fmIG0z0/tB56EUYM0bYzwTap0dckXMCSi8= MIME-Version: 1.0 Received: by 10.229.104.204 with SMTP id q12mr2361361qco.228.1289601061383; Fri, 12 Nov 2010 14:31:01 -0800 (PST) Received: by 10.229.247.66 with HTTP; Fri, 12 Nov 2010 14:31:01 -0800 (PST) In-Reply-To: References: Date: Sat, 13 Nov 2010 00:31:01 +0200 Message-ID: Subject: Re: 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 22:31:12 +0000 (UTC) diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/c index db05400..5ee5afa 100644 --- a/drivers/media/video/cx23885/cx23885-cards.c +++ b/drivers/media/video/cx23885/cx23885-cards.c @@ -309,6 +309,23 @@ struct cx23885_board cx23885_boards[] = { CX25840_COMPONENT_ON, } }, }, + [CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200] = { + .name = "LEADTEK WinFast PxPVR2200", + .porta = CX23885_ANALOG_VIDEO, + .portb = CX23885_MPEG_ENCODER, + .tuner_type = TUNER_XC2028, + .tuner_addr = 0x61, + .input = {{ + .type = CX23885_VMUX_TELEVISION, + .vmux = CX25840_VIN2_CH1 | + CX25840_VIN5_CH2 | + CX25840_NONE0_CH3, + }, { + .type = CX23885_VMUX_SVIDEO, + .vmux = CX25840_SVIDEO_LUMA3 | + CX25840_SVIDEO_CHROMA4, + } }, + }, }; const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards); @@ -496,6 +513,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_PXPVR2200, }, }; const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids); @@ -791,6 +812,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev) cx_set(GP0_IO, 0x00050005); break; case CX23885_BOARD_HAUPPAUGE_HVR1700: + case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200: /* GPIO-0 TDA10048 demodulator reset */ /* GPIO-2 TDA8295A Reset */ /* GPIO-3-10 cx23417 data0-7 */ @@ -1218,6 +1240,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) case CX23885_BOARD_HAUPPAUGE_HVR1850: case CX23885_BOARD_COMPRO_VIDEOMATE_E800: case CX23885_BOARD_HAUPPAUGE_HVR1290: + case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200: default: ts2->gen_ctrl_val = 0xc; /* Serial bus + punctured clock */ ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */ @@ -1245,6 +1268,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) case CX23885_BOARD_MAGICPRO_PROHDTVE2: case CX23885_BOARD_HAUPPAUGE_HVR1290: case CX23885_BOARD_LEADTEK_WINFAST_PXTV1200: + case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200: dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_bus[2].i2c_adap, NULL, "cx25840", 0x88 >> 1, NULL); diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885 index ed94b17..0dc8e44 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_PXPVR2200 29 #define GPIO_0 0x00000001 #define GPIO_1 0x00000002 diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519 index 6cf6855..46c62ec 100644 diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/c index db05400..5ee5afa 100644 --- a/drivers/media/video/cx23885/cx23885-cards.c +++ b/drivers/media/video/cx23885/cx23885-cards.c @@ -309,6 +309,23 @@ struct cx23885_board cx23885_boards[] = { CX25840_COMPONENT_ON, } }, }, + [CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200] = { + .name = "LEADTEK WinFast PxPVR2200", + .porta = CX23885_ANALOG_VIDEO, + .portb = CX23885_MPEG_ENCODER, + .tuner_type = TUNER_XC2028, + .tuner_addr = 0x61, + .input = {{ + .type = CX23885_VMUX_TELEVISION, + .vmux = CX25840_VIN2_CH1 | + CX25840_VIN5_CH2 | + CX25840_NONE0_CH3, + }, { + .type = CX23885_VMUX_SVIDEO, + .vmux = CX25840_SVIDEO_LUMA3 | + CX25840_SVIDEO_CHROMA4, + } }, + }, }; const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards); @@ -496,6 +513,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_PXPVR2200, }, }; const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids); @@ -791,6 +812,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev) cx_set(GP0_IO, 0x00050005); break; case CX23885_BOARD_HAUPPAUGE_HVR1700: + case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200: /* GPIO-0 TDA10048 demodulator reset */ /* GPIO-2 TDA8295A Reset */ /* GPIO-3-10 cx23417 data0-7 */ @@ -1218,6 +1240,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) case CX23885_BOARD_HAUPPAUGE_HVR1850: case CX23885_BOARD_COMPRO_VIDEOMATE_E800: case CX23885_BOARD_HAUPPAUGE_HVR1290: + case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200: default: ts2->gen_ctrl_val = 0xc; /* Serial bus + punctured clock */ ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */ @@ -1245,6 +1268,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) case CX23885_BOARD_MAGICPRO_PROHDTVE2: case CX23885_BOARD_HAUPPAUGE_HVR1290: case CX23885_BOARD_LEADTEK_WINFAST_PXTV1200: + case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200: dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_bus[2].i2c_adap, NULL, "cx25840", 0x88 >> 1, NULL); diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885 index ed94b17..0dc8e44 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_PXPVR2200 29 #define GPIO_0 0x00000001 #define GPIO_1 0x00000002 diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519 index 6cf6855..46c62ec 100644 &dev->i2c_bus[2].i2c_adap, NULL, "cx25840", 0x88 >> 1, NULL); diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885 index ed94b17..0dc8e44 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_PXPVR2200 29 #define GPIO_0 0x00000001 #define GPIO_1 0x00000002