From patchwork Wed Jan 19 20:41:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sensoray-dev X-Patchwork-Id: 490001 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 p0JKpO7t027142 for ; Wed, 19 Jan 2011 20:51:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752603Ab1ASUvX (ORCPT ); Wed, 19 Jan 2011 15:51:23 -0500 Received: from gateway11.websitewelcome.com ([67.18.72.139]:58323 "HELO gateway11.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752488Ab1ASUvW (ORCPT ); Wed, 19 Jan 2011 15:51:22 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 19 Jan 2011 20:51:25 +0000 (UTC) X-Greylist: delayed 575 seconds by postgrey-1.27 at vger.kernel.org; Wed, 19 Jan 2011 15:51:22 EST Received: (qmail 949 invoked from network); 19 Jan 2011 20:50:30 -0000 Received: from gator886.hostgator.com (174.120.40.226) by gateway11.websitewelcome.com with SMTP; 19 Jan 2011 20:50:30 -0000 Received: from [66.15.212.169] (port=24724 helo=[10.140.5.9]) by gator886.hostgator.com with esmtp (Exim 4.69) (envelope-from ) id 1Pfeqf-0006of-Eu; Wed, 19 Jan 2011 14:41:45 -0600 Message-ID: <4D374C89.4050004@sensoray.com> Date: Wed, 19 Jan 2011 12:41:45 -0800 From: Sensoray Linux Development User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.11) Gecko/20100713 Thunderbird/3.0.6 MIME-Version: 1.0 To: Linux Media Mailing List , Mauro Carvalho Chehab Subject: [PATCH] s2255drv: firmware re-loading changes X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator886.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - sensoray.com X-Source: X-Source-Args: X-Source-Dir: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c index b63f8ca..561909b 100644 --- a/drivers/media/video/s2255drv.c +++ b/drivers/media/video/s2255drv.c @@ -57,7 +57,7 @@ #include #define S2255_MAJOR_VERSION 1 -#define S2255_MINOR_VERSION 20 +#define S2255_MINOR_VERSION 21 #define S2255_RELEASE 0 #define S2255_VERSION KERNEL_VERSION(S2255_MAJOR_VERSION, \ S2255_MINOR_VERSION, \ @@ -312,9 +312,9 @@ struct s2255_fh { }; /* current cypress EEPROM firmware version */ -#define S2255_CUR_USB_FWVER ((3 << 8) | 6) +#define S2255_CUR_USB_FWVER ((3 << 8) | 11) /* current DSP FW version */ -#define S2255_CUR_DSP_FWVER 8 +#define S2255_CUR_DSP_FWVER 10102 /* Need DSP version 5+ for video status feature */ #define S2255_MIN_DSP_STATUS 5 #define S2255_MIN_DSP_COLORFILTER 8 @@ -492,9 +492,11 @@ static void planar422p_to_yuv_packed(const unsigned char *in, static void s2255_reset_dsppower(struct s2255_dev *dev) { - s2255_vendor_req(dev, 0x40, 0x0b0b, 0x0b0b, NULL, 0, 1); + s2255_vendor_req(dev, 0x40, 0x0b0b, 0x0b01, NULL, 0, 1); msleep(10); s2255_vendor_req(dev, 0x50, 0x0000, 0x0000, NULL, 0, 1); + msleep(600); + s2255_vendor_req(dev, 0x10, 0x0000, 0x0000, NULL, 0, 1); return; }