Skip to content

L
linux-davinci
Commit 47dfd21f authored by Jim Paris's avatar Jim Paris Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (9858): gspca - ov534: Initialization cleanup. 

Signed-off-by: default avatarJim Paris <jim@jtan.com>
Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 442a43f5
Show whitespace changes
Inline Side-by-side
Showing with 159 additions and 178 deletions
drivers/media/video/gspca/ov534.c
View file @ 47dfd21f
...@@ -93,19 +93,6 @@ static u8 ov534_reg_read(struct usb_device *udev, u16 reg) ...@@ -93,19 +93,6 @@ static u8 ov534_reg_read(struct usb_device *udev, u16 reg)
return data; return data;
} }
static void ov534_reg_verify_write(struct usb_device *udev, u16 reg, u8 val)
{
u8 data;
ov534_reg_write(udev, reg, val);
data = ov534_reg_read(udev, reg);
if (data != val) {
PDEBUG(D_ERR | D_USBO,
"unexpected result from read: 0x%02x != 0x%02x", val,
data);
}
}
/* Two bits control LED: 0x21 bit 7 and 0x23 bit 7. /* Two bits control LED: 0x21 bit 7 and 0x23 bit 7.
* (direction and output)? */ * (direction and output)? */
static void ov534_set_led(struct usb_device *udev, int status) static void ov534_set_led(struct usb_device *udev, int status)
...@@ -161,174 +148,168 @@ static void sccb_reg_write(struct usb_device *udev, u16 reg, u8 val) ...@@ -161,174 +148,168 @@ static void sccb_reg_write(struct usb_device *udev, u16 reg, u8 val)
PDEBUG(D_ERR, "sccb_reg_write failed"); PDEBUG(D_ERR, "sccb_reg_write failed");
} }
/* setup method */ static const __u8 ov534_reg_initdata[][2] = {
static void ov534_setup(struct usb_device *udev) { 0xe7, 0x3a },
{
ov534_reg_verify_write(udev, 0xe7, 0x3a); { OV534_REG_ADDRESS, 0x42 }, /* select OV772x sensor */
ov534_reg_write(udev, OV534_REG_ADDRESS, 0x60); { 0xc2, 0x0c },
ov534_reg_write(udev, OV534_REG_ADDRESS, 0x60); { 0x88, 0xf8 },
ov534_reg_write(udev, OV534_REG_ADDRESS, 0x60); { 0xc3, 0x69 },
ov534_reg_write(udev, OV534_REG_ADDRESS, 0x42); { 0x89, 0xff },
{ 0x76, 0x03 },
ov534_reg_verify_write(udev, 0xc2, 0x0c); { 0x92, 0x01 },
ov534_reg_verify_write(udev, 0x88, 0xf8); { 0x93, 0x18 },
ov534_reg_verify_write(udev, 0xc3, 0x69); { 0x94, 0x10 },
ov534_reg_verify_write(udev, 0x89, 0xff); { 0x95, 0x10 },
ov534_reg_verify_write(udev, 0x76, 0x03); { 0xe2, 0x00 },
ov534_reg_verify_write(udev, 0x92, 0x01); { 0xe7, 0x3e },
ov534_reg_verify_write(udev, 0x93, 0x18);
ov534_reg_verify_write(udev, 0x94, 0x10); { 0x1c, 0x0a },
ov534_reg_verify_write(udev, 0x95, 0x10); { 0x1d, 0x22 },
ov534_reg_verify_write(udev, 0xe2, 0x00); { 0x1d, 0x06 },
ov534_reg_verify_write(udev, 0xe7, 0x3e);
{ 0x96, 0x00 },
ov534_reg_write(udev, 0x1c, 0x0a);
ov534_reg_write(udev, 0x1d, 0x22); { 0x97, 0x20 },
ov534_reg_write(udev, 0x1d, 0x06); { 0x97, 0x20 },
{ 0x97, 0x20 },
ov534_reg_verify_write(udev, 0x96, 0x00); { 0x97, 0x0a },
{ 0x97, 0x3f },
ov534_reg_write(udev, 0x97, 0x20); { 0x97, 0x4a },
ov534_reg_write(udev, 0x97, 0x20); { 0x97, 0x20 },
ov534_reg_write(udev, 0x97, 0x20); { 0x97, 0x15 },
ov534_reg_write(udev, 0x97, 0x0a); { 0x97, 0x0b },
ov534_reg_write(udev, 0x97, 0x3f);
ov534_reg_write(udev, 0x97, 0x4a); { 0x8e, 0x40 },
ov534_reg_write(udev, 0x97, 0x20); { 0x1f, 0x81 },
ov534_reg_write(udev, 0x97, 0x15); { 0x34, 0x05 },
ov534_reg_write(udev, 0x97, 0x0b); { 0xe3, 0x04 },
{ 0x88, 0x00 },
ov534_reg_verify_write(udev, 0x8e, 0x40); { 0x89, 0x00 },
ov534_reg_verify_write(udev, 0x1f, 0x81); { 0x76, 0x00 },
ov534_reg_verify_write(udev, 0x34, 0x05); { 0xe7, 0x2e },
ov534_reg_verify_write(udev, 0xe3, 0x04); { 0x31, 0xf9 },
ov534_reg_verify_write(udev, 0x88, 0x00); { 0x25, 0x42 },
ov534_reg_verify_write(udev, 0x89, 0x00); { 0x21, 0xf0 },
ov534_reg_verify_write(udev, 0x76, 0x00);
ov534_reg_verify_write(udev, 0xe7, 0x2e); { 0x1c, 0x00 },
ov534_reg_verify_write(udev, 0x31, 0xf9); { 0x1d, 0x40 },
ov534_reg_verify_write(udev, 0x25, 0x42); { 0x1d, 0x02 },
ov534_reg_verify_write(udev, 0x21, 0xf0); { 0x1d, 0x00 },
{ 0x1d, 0x02 },
ov534_reg_write(udev, 0x1c, 0x00); { 0x1d, 0x57 },
ov534_reg_write(udev, 0x1d, 0x40); { 0x1d, 0xff },
ov534_reg_write(udev, 0x1d, 0x02);
ov534_reg_write(udev, 0x1d, 0x00); { 0x8d, 0x1c },
ov534_reg_write(udev, 0x1d, 0x02); { 0x8e, 0x80 },
ov534_reg_write(udev, 0x1d, 0x57); { 0xe5, 0x04 },
ov534_reg_write(udev, 0x1d, 0xff);
{ 0xc0, 0x50 },
ov534_reg_verify_write(udev, 0x8d, 0x1c); { 0xc1, 0x3c },
ov534_reg_verify_write(udev, 0x8e, 0x80); { 0xc2, 0x0c },
ov534_reg_verify_write(udev, 0xe5, 0x04); };
ov534_set_led(udev, 1);
sccb_reg_write(udev, 0x12, 0x80);
sccb_reg_write(udev, 0x11, 0x01);
sccb_reg_write(udev, 0x11, 0x01);
sccb_reg_write(udev, 0x11, 0x01);
sccb_reg_write(udev, 0x11, 0x01);
sccb_reg_write(udev, 0x11, 0x01);
sccb_reg_write(udev, 0x11, 0x01);
sccb_reg_write(udev, 0x11, 0x01);
sccb_reg_write(udev, 0x11, 0x01);
sccb_reg_write(udev, 0x11, 0x01);
sccb_reg_write(udev, 0x11, 0x01);
sccb_reg_write(udev, 0x11, 0x01);
ov534_set_led(udev, 0);
sccb_reg_write(udev, 0x3d, 0x03);
sccb_reg_write(udev, 0x17, 0x26);
sccb_reg_write(udev, 0x18, 0xa0);
sccb_reg_write(udev, 0x19, 0x07);
sccb_reg_write(udev, 0x1a, 0xf0);
sccb_reg_write(udev, 0x32, 0x00);
sccb_reg_write(udev, 0x29, 0xa0);
sccb_reg_write(udev, 0x2c, 0xf0);
sccb_reg_write(udev, 0x65, 0x20);
sccb_reg_write(udev, 0x11, 0x01);
sccb_reg_write(udev, 0x42, 0x7f);
sccb_reg_write(udev, 0x63, 0xe0);
sccb_reg_write(udev, 0x64, 0xff);
sccb_reg_write(udev, 0x66, 0x00);
sccb_reg_write(udev, 0x13, 0xf0);
sccb_reg_write(udev, 0x0d, 0x41);
sccb_reg_write(udev, 0x0f, 0xc5);
sccb_reg_write(udev, 0x14, 0x11);
ov534_set_led(udev, 1);
sccb_reg_write(udev, 0x22, 0x7f);
sccb_reg_write(udev, 0x23, 0x03);
sccb_reg_write(udev, 0x24, 0x40);
sccb_reg_write(udev, 0x25, 0x30);
sccb_reg_write(udev, 0x26, 0xa1);
sccb_reg_write(udev, 0x2a, 0x00);
sccb_reg_write(udev, 0x2b, 0x00);
sccb_reg_write(udev, 0x6b, 0xaa);
sccb_reg_write(udev, 0x13, 0xff);
ov534_set_led(udev, 0); static const __u8 ov772x_reg_initdata[][2] = {
{ 0x12, 0x80 },
{ 0x11, 0x01 },
{ 0x3d, 0x03 },
{ 0x17, 0x26 },
{ 0x18, 0xa0 },
{ 0x19, 0x07 },
{ 0x1a, 0xf0 },
{ 0x32, 0x00 },
{ 0x29, 0xa0 },
{ 0x2c, 0xf0 },
{ 0x65, 0x20 },
{ 0x11, 0x01 },
{ 0x42, 0x7f },
{ 0x63, 0xe0 },
{ 0x64, 0xff },
{ 0x66, 0x00 },
{ 0x13, 0xf0 },
{ 0x0d, 0x41 },
{ 0x0f, 0xc5 },
{ 0x14, 0x11 },
{ 0x22, 0x7f },
{ 0x23, 0x03 },
{ 0x24, 0x40 },
{ 0x25, 0x30 },
{ 0x26, 0xa1 },
{ 0x2a, 0x00 },
{ 0x2b, 0x00 },
{ 0x6b, 0xaa },
{ 0x13, 0xff },
{ 0x90, 0x05 },
{ 0x91, 0x01 },
{ 0x92, 0x03 },
{ 0x93, 0x00 },
{ 0x94, 0x60 },
{ 0x95, 0x3c },
{ 0x96, 0x24 },
{ 0x97, 0x1e },
{ 0x98, 0x62 },
{ 0x99, 0x80 },
{ 0x9a, 0x1e },
{ 0x9b, 0x08 },
{ 0x9c, 0x20 },
{ 0x9e, 0x81 },
{ 0xa6, 0x04 },
{ 0x7e, 0x0c },
{ 0x7f, 0x16 },
{ 0x80, 0x2a },
{ 0x81, 0x4e },
{ 0x82, 0x61 },
{ 0x83, 0x6f },
{ 0x84, 0x7b },
{ 0x85, 0x86 },
{ 0x86, 0x8e },
{ 0x87, 0x97 },
{ 0x88, 0xa4 },
{ 0x89, 0xaf },
{ 0x8a, 0xc5 },
{ 0x8b, 0xd7 },
{ 0x8c, 0xe8 },
{ 0x8d, 0x20 },
{ 0x0c, 0x90 },
{ 0x2b, 0x00 },
{ 0x22, 0x7f },
{ 0x23, 0x03 },
{ 0x11, 0x01 },
{ 0x0c, 0xd0 },
{ 0x64, 0xff },
{ 0x0d, 0x41 },
{ 0x14, 0x41 },
{ 0x0e, 0xcd },
{ 0xac, 0xbf },
{ 0x8e, 0x00 },
{ 0x0c, 0xd0 }
};
sccb_reg_write(udev, 0x90, 0x05);
sccb_reg_write(udev, 0x91, 0x01);
sccb_reg_write(udev, 0x92, 0x03);
sccb_reg_write(udev, 0x93, 0x00);
sccb_reg_write(udev, 0x94, 0x60);
sccb_reg_write(udev, 0x95, 0x3c);
sccb_reg_write(udev, 0x96, 0x24);
sccb_reg_write(udev, 0x97, 0x1e);
sccb_reg_write(udev, 0x98, 0x62);
sccb_reg_write(udev, 0x99, 0x80);
sccb_reg_write(udev, 0x9a, 0x1e);
sccb_reg_write(udev, 0x9b, 0x08);
sccb_reg_write(udev, 0x9c, 0x20);
sccb_reg_write(udev, 0x9e, 0x81);
ov534_set_led(udev, 1); /* setup method */
static void ov534_setup(struct usb_device *udev)
{
int i;
sccb_reg_write(udev, 0xa6, 0x04); /* Initialize bridge chip */
sccb_reg_write(udev, 0x7e, 0x0c); for (i = 0; i < ARRAY_SIZE(ov534_reg_initdata); i++)
sccb_reg_write(udev, 0x7f, 0x16); ov534_reg_write(udev, ov534_reg_initdata[i][0],
sccb_reg_write(udev, 0x80, 0x2a); ov534_reg_initdata[i][1]);
sccb_reg_write(udev, 0x81, 0x4e);
sccb_reg_write(udev, 0x82, 0x61);
sccb_reg_write(udev, 0x83, 0x6f);
sccb_reg_write(udev, 0x84, 0x7b);
sccb_reg_write(udev, 0x85, 0x86);
sccb_reg_write(udev, 0x86, 0x8e);
sccb_reg_write(udev, 0x87, 0x97);
sccb_reg_write(udev, 0x88, 0xa4);
sccb_reg_write(udev, 0x89, 0xaf);
sccb_reg_write(udev, 0x8a, 0xc5);
sccb_reg_write(udev, 0x8b, 0xd7);
sccb_reg_write(udev, 0x8c, 0xe8);
sccb_reg_write(udev, 0x8d, 0x20);
sccb_reg_write(udev, 0x0c, 0x90);
ov534_reg_verify_write(udev, 0xc0, 0x50);
ov534_reg_verify_write(udev, 0xc1, 0x3c);
ov534_reg_verify_write(udev, 0xc2, 0x0c);
ov534_set_led(udev, 1); ov534_set_led(udev, 1);
sccb_reg_write(udev, 0x2b, 0x00); /* Initialize sensor */
sccb_reg_write(udev, 0x22, 0x7f); for (i = 0; i < ARRAY_SIZE(ov772x_reg_initdata); i++)
sccb_reg_write(udev, 0x23, 0x03); sccb_reg_write(udev, ov772x_reg_initdata[i][0],
sccb_reg_write(udev, 0x11, 0x01); ov772x_reg_initdata[i][1]);
sccb_reg_write(udev, 0x0c, 0xd0);
sccb_reg_write(udev, 0x64, 0xff);
sccb_reg_write(udev, 0x0d, 0x41);
sccb_reg_write(udev, 0x14, 0x41);
sccb_reg_write(udev, 0x0e, 0xcd);
sccb_reg_write(udev, 0xac, 0xbf);
sccb_reg_write(udev, 0x8e, 0x00);
sccb_reg_write(udev, 0x0c, 0xd0);
ov534_reg_write(udev, 0xe0, 0x09); ov534_reg_write(udev, 0xe0, 0x09);
ov534_set_led(udev, 0); ov534_set_led(udev, 0);
...@@ -374,24 +355,24 @@ static int sd_init(struct gspca_dev *gspca_dev) ...@@ -374,24 +355,24 @@ static int sd_init(struct gspca_dev *gspca_dev)
case 50: case 50:
sccb_reg_write(gspca_dev->dev, 0x11, 0x01); sccb_reg_write(gspca_dev->dev, 0x11, 0x01);
sccb_reg_write(gspca_dev->dev, 0x0d, 0x41); sccb_reg_write(gspca_dev->dev, 0x0d, 0x41);
ov534_reg_verify_write(gspca_dev->dev, 0xe5, 0x02); ov534_reg_write(gspca_dev->dev, 0xe5, 0x02);
break; break;
case 40: case 40:
sccb_reg_write(gspca_dev->dev, 0x11, 0x02); sccb_reg_write(gspca_dev->dev, 0x11, 0x02);
sccb_reg_write(gspca_dev->dev, 0x0d, 0xc1); sccb_reg_write(gspca_dev->dev, 0x0d, 0xc1);
ov534_reg_verify_write(gspca_dev->dev, 0xe5, 0x04); ov534_reg_write(gspca_dev->dev, 0xe5, 0x04);
break; break;
/* case 30: */ /* case 30: */
default: default:
fr = 30; fr = 30;
sccb_reg_write(gspca_dev->dev, 0x11, 0x04); sccb_reg_write(gspca_dev->dev, 0x11, 0x04);
sccb_reg_write(gspca_dev->dev, 0x0d, 0x81); sccb_reg_write(gspca_dev->dev, 0x0d, 0x81);
ov534_reg_verify_write(gspca_dev->dev, 0xe5, 0x02); ov534_reg_write(gspca_dev->dev, 0xe5, 0x02);
break; break;
case 15: case 15:
sccb_reg_write(gspca_dev->dev, 0x11, 0x03); sccb_reg_write(gspca_dev->dev, 0x11, 0x03);
sccb_reg_write(gspca_dev->dev, 0x0d, 0x41); sccb_reg_write(gspca_dev->dev, 0x0d, 0x41);
ov534_reg_verify_write(gspca_dev->dev, 0xe5, 0x04); ov534_reg_write(gspca_dev->dev, 0xe5, 0x04);
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment