From patchwork Sat Oct 16 17:23:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: VDRU VDRU X-Patchwork-Id: 259141 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 o9GHO2jD009715 for ; Sat, 16 Oct 2010 17:24:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752966Ab0JPRYA (ORCPT ); Sat, 16 Oct 2010 13:24:00 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:53745 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751063Ab0JPRYA (ORCPT ); Sat, 16 Oct 2010 13:24:00 -0400 Received: by pzk33 with SMTP id 33so267662pzk.19 for ; Sat, 16 Oct 2010 10:23:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:content-type; bh=bxozPfS5nlQoHrP6dHC0XrVbCrHvRk98VP+8whvwUMs=; b=n4eocioFaZLARF5Ri7bKh+hl2TadeC/me+Oevb3Qx5Q4V435b0JfqhpWzH7jotJh4g QIPjkFydKnfpbbs1U2LcvV+V1JMPbq8Nl/pO3I5uR3geEaRm9+5myfHNlzP9CeXmNb4B ZONmQPE3p7k/SqY2gOp6bRSmsHnw/k7nHUA3Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type; b=x837Tg6JxlLF1R4Wl6LfZgz4h29iid2xi94jfzvATvLkpoTFxoUBkREs+YiT5V2k+a sGdY9ryOQloXqYtyj2eJ/laU3YniRm++FCvpk8o+394eDz8SjmWGyKReFB2aOm2V83WC DWudQ+IrKuTT77cR0oZpT9afDPWgFDQlyjh3Q= Received: by 10.142.114.5 with SMTP id m5mr1795004wfc.237.1287249838097; Sat, 16 Oct 2010 10:23:58 -0700 (PDT) Received: from [192.168.0.4] (174-24-140-227.tukw.qwest.net [174.24.140.227]) by mx.google.com with ESMTPS id x18sm7893583wfa.11.2010.10.16.10.23.55 (version=SSLv3 cipher=RC4-MD5); Sat, 16 Oct 2010 10:23:56 -0700 (PDT) Message-ID: <4CB9DFA7.80208@gmail.com> Date: Sat, 16 Oct 2010 10:23:51 -0700 From: "D. K." User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.9) Gecko/20100915 Thunderbird/3.1.4 MIME-Version: 1.0 To: linux-media@vger.kernel.org Subject: [PATCH] gp8psk: Add support for the Genpix Skywalker-2 (against git) 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]); Sat, 16 Oct 2010 17:24:03 +0000 (UTC) diff -pruN v4l-dvb.orig/drivers/media/dvb/dvb-usb/dvb-usb-ids.h v4l-dvb/drivers/media/dvb/dvb-usb/dvb-usb-ids.h --- v4l-dvb.orig/drivers/media/dvb/dvb-usb/dvb-usb-ids.h 2010-10-16 09:10:18.000000000 -0700 +++ v4l-dvb/drivers/media/dvb/dvb-usb/dvb-usb-ids.h 2010-10-16 09:17:36.000000000 -0700 @@ -271,6 +271,7 @@ #define USB_PID_GENPIX_8PSK_REV_2 0x0202 #define USB_PID_GENPIX_SKYWALKER_1 0x0203 #define USB_PID_GENPIX_SKYWALKER_CW3K 0x0204 +#define USB_PID_GENPIX_SKYWALKER_2 0x0206 #define USB_PID_SIGMATEK_DVB_110 0x6610 #define USB_PID_MSI_DIGI_VOX_MINI_II 0x1513 #define USB_PID_MSI_DIGIVOX_DUO 0x8801 diff -pruN v4l-dvb.orig/drivers/media/dvb/dvb-usb/gp8psk.c v4l-dvb/drivers/media/dvb/dvb-usb/gp8psk.c --- v4l-dvb.orig/drivers/media/dvb/dvb-usb/gp8psk.c 2010-10-16 09:10:17.000000000 -0700 +++ v4l-dvb/drivers/media/dvb/dvb-usb/gp8psk.c 2010-10-16 09:30:30.000000000 -0700 @@ -227,6 +227,7 @@ static struct usb_device_id gp8psk_usb_t { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_1_WARM) }, { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_8PSK_REV_2) }, { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_1) }, + { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_2) }, /* { USB_DEVICE(USB_VID_GENPIX, USB_PID_GENPIX_SKYWALKER_CW3K) }, */ { 0 }, }; @@ -258,7 +259,7 @@ static struct dvb_usb_device_properties .generic_bulk_ctrl_endpoint = 0x01, - .num_device_descs = 3, + .num_device_descs = 4, .devices = { { .name = "Genpix 8PSK-to-USB2 Rev.1 DVB-S receiver", .cold_ids = { &gp8psk_usb_table[0], NULL }, @@ -272,6 +273,10 @@ static struct dvb_usb_device_properties .cold_ids = { NULL }, .warm_ids = { &gp8psk_usb_table[3], NULL }, }, + { .name = "Genpix SkyWalker-2 DVB-S receiver", + .cold_ids = { NULL }, + .warm_ids = { &gp8psk_usb_table[4], NULL }, + }, { NULL }, } };