leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] s2255drv: firmware re-loading changes

Browse Source 
Change for firmware re-loading and updated firmware versions.

Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
sensoray-dev 2011-01-19 17:41:45 -03:00 committed by Mauro Carvalho Chehab
parent 0552774d06
commit 752eb7ae50
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/video/s2255drv.c
View File

@ -57,7 +57,7 @@
#include <linux/usb.h> #include <linux/usb.h>
#define S2255_MAJOR_VERSION 1 #define S2255_MAJOR_VERSION 1
#define S2255_MINOR_VERSION 20 #define S2255_MINOR_VERSION 21
#define S2255_RELEASE 0 #define S2255_RELEASE 0
#define S2255_VERSION KERNEL_VERSION(S2255_MAJOR_VERSION, \ #define S2255_VERSION KERNEL_VERSION(S2255_MAJOR_VERSION, \
S2255_MINOR_VERSION, \ S2255_MINOR_VERSION, \
@ -312,9 +312,9 @@ struct s2255_fh {
}; };
/* current cypress EEPROM firmware version */ /* 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 */ /* current DSP FW version */
#define S2255_CUR_DSP_FWVER 8 #define S2255_CUR_DSP_FWVER 10102
/* Need DSP version 5+ for video status feature */ /* Need DSP version 5+ for video status feature */
#define S2255_MIN_DSP_STATUS 5 #define S2255_MIN_DSP_STATUS 5
#define S2255_MIN_DSP_COLORFILTER 8 #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) 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); msleep(10);
s2255_vendor_req(dev, 0x50, 0x0000, 0x0000, NULL, 0, 1); s2255_vendor_req(dev, 0x50, 0x0000, 0x0000, NULL, 0, 1);
msleep(600);
s2255_vendor_req(dev, 0x10, 0x0000, 0x0000, NULL, 0, 1);
return; return;
} }