aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/sonixj.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-11-11 06:42:56 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 14:53:38 -0500
commit6270330abea2d9556583d597bb78d64b291aa6ba (patch)
tree4a39d22fba3d833815fdea7a7bc702509ebb76b0 /drivers/media/video/gspca/sonixj.c
parent821ced29a4aee1bd21d1d114cc9c7247b3aa4ba3 (diff)
V4L/DVB (9681): gspca: Rewrite the exchanges with the sensor ov7648 of sonixj.
The new exchanges are adapted from MS-win traces and the webcams work better. Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/sonixj.c')
-rw-r--r--drivers/media/video/gspca/sonixj.c142
1 files changed, 73 insertions, 69 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 49749fa4151c..c3859b5b4ba3 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -252,13 +252,13 @@ static const __u8 sn_ov7630[] = {
252 252
253static const __u8 sn_ov7648[] = { 253static const __u8 sn_ov7648[] = {
254/* reg0 reg1 reg2 reg3 reg4 reg5 reg6 reg7 */ 254/* reg0 reg1 reg2 reg3 reg4 reg5 reg6 reg7 */
255 0x00, 0x21, 0x62, 0x00, 0x1a, 0x20, 0x20, 0x20, 255 0x00, 0x63, 0x40, 0x00, 0x1a, 0x20, 0x20, 0x20,
256/* reg8 reg9 rega regb regc regd rege regf */ 256/* reg8 reg9 rega regb regc regd rege regf */
257 0xa1, 0x6e, 0x18, 0x65, 0x00, 0x00, 0x00, 0x10, 257 0x81, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
258/* reg10 reg11 reg12 reg13 reg14 reg15 reg16 reg17 */ 258/* reg10 reg11 reg12 reg13 reg14 reg15 reg16 reg17 */
259 0x03, 0x00, 0x00, 0x06, 0x06, 0x28, 0x1e, 0x82, 259 0x03, 0x00, 0x00, 0x01, 0x00, 0x28, 0x1e, 0x00,
260/* reg18 reg19 reg1a reg1b reg1c reg1d reg1e reg1f */ 260/* reg18 reg19 reg1a reg1b reg1c reg1d reg1e reg1f */
261 0x07, 0x00, 0x00, 0x00, 0x00, 0x00 261 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00
262}; 262};
263 263
264static const __u8 sn_ov7660[] = { 264static const __u8 sn_ov7660[] = {
@@ -490,6 +490,53 @@ static const __u8 ov7630_sensor_init[][8] = {
490/* {0xb1, 0x21, 0x01, 0x88, 0x70, 0x00, 0x00, 0x10}, */ 490/* {0xb1, 0x21, 0x01, 0x88, 0x70, 0x00, 0x00, 0x10}, */
491 {} 491 {}
492}; 492};
493
494static const __u8 ov7648_sensor_init[][8] = {
495 {0xa1, 0x21, 0x76, 0x00, 0x00, 0x00, 0x00, 0x10},
496 {0xa1, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10}, /* reset */
497 {0xa1, 0x21, 0x12, 0x00, 0x00, 0x00, 0x00, 0x10},
498 {0xd1, 0x21, 0x03, 0xa4, 0x30, 0x88, 0x00, 0x10},
499 {0xb1, 0x21, 0x11, 0x80, 0x08, 0x00, 0x00, 0x10},
500 {0xc1, 0x21, 0x13, 0xa0, 0x04, 0x84, 0x00, 0x10},
501 {0xd1, 0x21, 0x17, 0x1a, 0x02, 0xba, 0xf4, 0x10},
502 {0xa1, 0x21, 0x1b, 0x04, 0x00, 0x00, 0x00, 0x10},
503 {0xd1, 0x21, 0x1f, 0x41, 0xc0, 0x80, 0x80, 0x10},
504 {0xd1, 0x21, 0x23, 0xde, 0xa0, 0x80, 0x32, 0x10},
505 {0xd1, 0x21, 0x27, 0xfe, 0xa0, 0x00, 0x91, 0x10},
506 {0xd1, 0x21, 0x2b, 0x00, 0x88, 0x85, 0x80, 0x10},
507 {0xc1, 0x21, 0x2f, 0x9c, 0x00, 0xc4, 0x00, 0x10},
508 {0xd1, 0x21, 0x60, 0xa6, 0x60, 0x88, 0x12, 0x10},
509 {0xd1, 0x21, 0x64, 0x88, 0x00, 0x00, 0x94, 0x10},
510 {0xd1, 0x21, 0x68, 0x7a, 0x0c, 0x00, 0x00, 0x10},
511 {0xd1, 0x21, 0x6c, 0x11, 0x33, 0x22, 0x00, 0x10},
512 {0xd1, 0x21, 0x70, 0x11, 0x00, 0x10, 0x50, 0x10},
513 {0xd1, 0x21, 0x74, 0x20, 0x06, 0x00, 0xb5, 0x10},
514 {0xd1, 0x21, 0x78, 0x8a, 0x00, 0x00, 0x00, 0x10},
515 {0xb1, 0x21, 0x7c, 0x00, 0x43, 0x00, 0x00, 0x10},
516
517 {0xd1, 0x21, 0x21, 0x86, 0x00, 0xde, 0xa0, 0x10},
518/* {0xd1, 0x21, 0x25, 0x80, 0x32, 0xfe, 0xa0, 0x10}, jfm done */
519/* {0xd1, 0x21, 0x29, 0x00, 0x91, 0x00, 0x88, 0x10}, jfm done */
520 {0xb1, 0x21, 0x2d, 0x85, 0x00, 0x00, 0x00, 0x10},
521/*...*/
522/* {0xa1, 0x21, 0x12, 0x08, 0x00, 0x00, 0x00, 0x10}, jfm done */
523/* {0xa1, 0x21, 0x75, 0x06, 0x00, 0x00, 0x00, 0x10}, jfm done */
524 {0xa1, 0x21, 0x19, 0x02, 0x00, 0x00, 0x00, 0x10},
525 {0xa1, 0x21, 0x10, 0x32, 0x00, 0x00, 0x00, 0x10},
526/* {0xa1, 0x21, 0x16, 0x00, 0x00, 0x00, 0x00, 0x10}, jfm done */
527/* {0xa1, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10}, * GAIN - def */
528/* {0xb1, 0x21, 0x01, 0x6c, 0x6c, 0x00, 0x00, 0x10}, * B R - def: 80 */
529/*...*/
530 {0xa1, 0x21, 0x11, 0x81, 0x00, 0x00, 0x00, 0x10}, /* CLKRC */
531/* {0xa1, 0x21, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x10}, jfm done */
532/* {0xa1, 0x21, 0x16, 0x00, 0x00, 0x00, 0x00, 0x10}, jfm done */
533/* {0xa1, 0x21, 0x2a, 0x91, 0x00, 0x00, 0x00, 0x10}, jfm done */
534/* {0xa1, 0x21, 0x2b, 0x00, 0x00, 0x00, 0x00, 0x10}, jfm done */
535/* {0xb1, 0x21, 0x01, 0x64, 0x84, 0x00, 0x00, 0x10}, * B R - def: 80 */
536
537 {}
538};
539
493static const __u8 ov7660_sensor_init[][8] = { 540static const __u8 ov7660_sensor_init[][8] = {
494 {0xa1, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10}, /* reset SCCB */ 541 {0xa1, 0x21, 0x12, 0x80, 0x00, 0x00, 0x00, 0x10}, /* reset SCCB */
495/* (delay 20ms) */ 542/* (delay 20ms) */
@@ -578,64 +625,6 @@ static const __u8 ov7660_sensor_init[][8] = {
578 {0xa1, 0x21, 0x2b, 0xc3, 0x00, 0x00, 0x00, 0x10}, 625 {0xa1, 0x21, 0x2b, 0xc3, 0x00, 0x00, 0x00, 0x10},
579 {} 626 {}
580}; 627};
581/* reg 0x04 reg 0x07 reg 0x10 */
582/* expo = (COM1 & 0x02) | ((AECHH & 0x2f) << 10) | (AECh << 2) */
583
584static const __u8 ov7648_sensor_init[][8] = {
585 {0xC1, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00},
586 {0xC1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00},
587 {0xC1, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00},
588 {0xA1, 0x6E, 0x3F, 0x20, 0x00, 0x00, 0x00, 0x10},
589 {0xA1, 0x6E, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10},
590 {0xA1, 0x6E, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x10},
591 {0xD1, 0x6E, 0x04, 0x02, 0xB1, 0x02, 0x39, 0x10},
592 {0xD1, 0x6E, 0x08, 0x00, 0x01, 0x00, 0x00, 0x10},
593 {0xD1, 0x6E, 0x0C, 0x02, 0x7F, 0x01, 0xE0, 0x10},
594 {0xD1, 0x6E, 0x12, 0x03, 0x02, 0x00, 0x03, 0x10},
595 {0xD1, 0x6E, 0x16, 0x85, 0x40, 0x4A, 0x40, 0x10},
596 {0xC1, 0x6E, 0x1A, 0x00, 0x80, 0x00, 0x00, 0x10},
597 {0xD1, 0x6E, 0x1D, 0x08, 0x03, 0x00, 0x00, 0x10},
598 {0xD1, 0x6E, 0x23, 0x00, 0xB0, 0x00, 0x94, 0x10},
599 {0xD1, 0x6E, 0x27, 0x58, 0x00, 0x00, 0x00, 0x10},
600 {0xD1, 0x6E, 0x2D, 0x14, 0x35, 0x61, 0x84, 0x10},
601 {0xD1, 0x6E, 0x31, 0xA2, 0xBD, 0xD8, 0xFF, 0x10},
602 {0xD1, 0x6E, 0x35, 0x06, 0x1E, 0x12, 0x02, 0x10},
603 {0xD1, 0x6E, 0x39, 0xAA, 0x53, 0x37, 0xD5, 0x10},
604 {0xA1, 0x6E, 0x3D, 0xF2, 0x00, 0x00, 0x00, 0x10},
605 {0xD1, 0x6E, 0x3E, 0x00, 0x00, 0x80, 0x03, 0x10},
606 {0xD1, 0x6E, 0x42, 0x03, 0x00, 0x00, 0x00, 0x10},
607 {0xC1, 0x6E, 0x46, 0x00, 0x80, 0x80, 0x00, 0x10},
608 {0xD1, 0x6E, 0x4B, 0x02, 0xEF, 0x08, 0xCD, 0x10},
609 {0xD1, 0x6E, 0x4F, 0x00, 0xD0, 0x00, 0xA0, 0x10},
610 {0xD1, 0x6E, 0x53, 0x01, 0xAA, 0x01, 0x40, 0x10},
611 {0xD1, 0x6E, 0x5A, 0x50, 0x04, 0x30, 0x03, 0x10},
612 {0xA1, 0x6E, 0x5E, 0x00, 0x00, 0x00, 0x00, 0x10},
613 {0xD1, 0x6E, 0x5F, 0x10, 0x40, 0xFF, 0x00, 0x10},
614 /* {0xD1, 0x6E, 0x63, 0x40, 0x40, 0x00, 0x00, 0x10},
615 {0xD1, 0x6E, 0x67, 0x00, 0x00, 0x00, 0x00, 0x10},
616 * This is currently setting a
617 * blue tint, and some things more , i leave it here for future test if
618 * somene is having problems with color on this sensor
619 {0xD1, 0x6E, 0x6B, 0x00, 0x00, 0x00, 0x00, 0x10},
620 {0xD1, 0x6E, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x10},
621 {0xC1, 0x6E, 0x73, 0x10, 0x80, 0xEB, 0x00, 0x10},
622 {0xA1, 0x6E, 0x1E, 0x03, 0x00, 0x00, 0x00, 0x10},
623 {0xA1, 0x6E, 0x15, 0x01, 0x00, 0x00, 0x00, 0x10},
624 {0xC1, 0x6E, 0x16, 0x40, 0x40, 0x40, 0x00, 0x10},
625 {0xA1, 0x6E, 0x1D, 0x08, 0x00, 0x00, 0x00, 0x10},
626 {0xA1, 0x6E, 0x06, 0x02, 0x00, 0x00, 0x00, 0x10},
627 {0xA1, 0x6E, 0x07, 0xB5, 0x00, 0x00, 0x00, 0x10},
628 {0xA1, 0x6E, 0x18, 0x6B, 0x00, 0x00, 0x00, 0x10},
629 {0xA1, 0x6E, 0x1D, 0x08, 0x00, 0x00, 0x00, 0x10},
630 {0xA1, 0x6E, 0x06, 0x02, 0x00, 0x00, 0x00, 0x10},
631 {0xA1, 0x6E, 0x07, 0xB8, 0x00, 0x00, 0x00, 0x10}, */
632 {0xC1, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00},
633 {0xA1, 0x6E, 0x06, 0x03, 0x00, 0x00, 0x00, 0x10}, /* Bright... */
634 {0xA1, 0x6E, 0x07, 0x66, 0x00, 0x00, 0x00, 0x10}, /* B.. */
635 {0xC1, 0x6E, 0x1A, 0x03, 0x65, 0x90, 0x00, 0x10}, /* Bright/Witen....*/
636/* {0xC1, 0x6E, 0x16, 0x45, 0x40, 0x60, 0x00, 0x10}, * Bright/Witene */
637 {}
638};
639 628
640static const __u8 qtable4[] = { 629static const __u8 qtable4[] = {
641 0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06, 630 0x06, 0x04, 0x04, 0x06, 0x04, 0x04, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06,
@@ -848,8 +837,8 @@ static int configure_gpio(struct gspca_dev *gspca_dev,
848 reg_w1(gspca_dev, 0x01, 0x40); 837 reg_w1(gspca_dev, 0x01, 0x40);
849 break; 838 break;
850 case SENSOR_OV7648: 839 case SENSOR_OV7648:
851 reg_w1(gspca_dev, 0x01, 0x43); 840 reg_w1(gspca_dev, 0x01, 0x63);
852 reg_w1(gspca_dev, 0x17, 0xae); 841 reg_w1(gspca_dev, 0x17, 0x20);
853 reg_w1(gspca_dev, 0x01, 0x42); 842 reg_w1(gspca_dev, 0x01, 0x42);
854 break; 843 break;
855/*jfm: from win trace */ 844/*jfm: from win trace */
@@ -943,6 +932,13 @@ static void ov7648_InitSensor(struct gspca_dev *gspca_dev)
943{ 932{
944 int i = 0; 933 int i = 0;
945 934
935 i2c_w8(gspca_dev, ov7648_sensor_init[i]);
936 i++;
937/* win: dble reset */
938 i2c_w8(gspca_dev, ov7648_sensor_init[i]); /* reset */
939 i++;
940 msleep(20);
941/* win: i2c reg read 00..7f */
946 while (ov7648_sensor_init[i][0]) { 942 while (ov7648_sensor_init[i][0]) {
947 i2c_w8(gspca_dev, ov7648_sensor_init[i]); 943 i2c_w8(gspca_dev, ov7648_sensor_init[i]);
948 i++; 944 i++;
@@ -1265,7 +1261,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
1265 reg17 = 0xe2; 1261 reg17 = 0xe2;
1266 break; 1262 break;
1267 case SENSOR_OV7648: 1263 case SENSOR_OV7648:
1268 reg17 = 0xae; 1264 reg17 = 0x20;
1269 break; 1265 break;
1270/*jfm: from win trace */ 1266/*jfm: from win trace */
1271 case SENSOR_OV7660: 1267 case SENSOR_OV7660:
@@ -1284,6 +1280,10 @@ static int sd_start(struct gspca_dev *gspca_dev)
1284 for (i = 0; i < 8; i++) 1280 for (i = 0; i < 8; i++)
1285 reg_w(gspca_dev, 0x84, reg84, sizeof reg84); 1281 reg_w(gspca_dev, 0x84, reg84, sizeof reg84);
1286 switch (sd->sensor) { 1282 switch (sd->sensor) {
1283 case SENSOR_OV7648:
1284 reg_w1(gspca_dev, 0x9a, 0x0a);
1285 reg_w1(gspca_dev, 0x99, 0x60);
1286 break;
1287 case SENSOR_OV7660: 1287 case SENSOR_OV7660:
1288 reg_w1(gspca_dev, 0x9a, 0x05); 1288 reg_w1(gspca_dev, 0x9a, 0x05);
1289 break; 1289 break;
@@ -1328,8 +1328,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
1328 break; 1328 break;
1329 case SENSOR_OV7648: 1329 case SENSOR_OV7648:
1330 ov7648_InitSensor(gspca_dev); 1330 ov7648_InitSensor(gspca_dev);
1331 reg17 = 0xa2; 1331 reg17 = 0x21;
1332 reg1 = 0x44; 1332/* reg1 = 0x42; * 42 - 46? */
1333/* if (mode) 1333/* if (mode)
1334 ; * 320x2... 1334 ; * 320x2...
1335 else 1335 else
@@ -1401,6 +1401,8 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
1401 { 0xa1, 0x11, 0x02, 0x09, 0x00, 0x00, 0x00, 0x10 }; 1401 { 0xa1, 0x11, 0x02, 0x09, 0x00, 0x00, 0x00, 0x10 };
1402 static const __u8 stopmi0360[] = 1402 static const __u8 stopmi0360[] =
1403 { 0xb1, 0x5d, 0x07, 0x00, 0x00, 0x00, 0x00, 0x10 }; 1403 { 0xb1, 0x5d, 0x07, 0x00, 0x00, 0x00, 0x00, 0x10 };
1404 static const __u8 stopov7648[] =
1405 { 0xa1, 0x21, 0x76, 0x20, 0x00, 0x00, 0x00, 0x10 };
1404 __u8 data; 1406 __u8 data;
1405 const __u8 *sn9c1xx; 1407 const __u8 *sn9c1xx;
1406 1408
@@ -1414,8 +1416,10 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
1414 i2c_w8(gspca_dev, stopmi0360); 1416 i2c_w8(gspca_dev, stopmi0360);
1415 data = 0x29; 1417 data = 0x29;
1416 break; 1418 break;
1417 case SENSOR_OV7630:
1418 case SENSOR_OV7648: 1419 case SENSOR_OV7648:
1420 i2c_w8(gspca_dev, stopov7648);
1421 /* fall thru */
1422 case SENSOR_OV7630:
1419 data = 0x29; 1423 data = 0x29;
1420 break; 1424 break;
1421 default: 1425 default:
@@ -1699,7 +1703,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
1699/* {USB_DEVICE(0x0c45, 0x6123), BSI(SN9C110, SanyoCCD, 0x??)}, */ 1703/* {USB_DEVICE(0x0c45, 0x6123), BSI(SN9C110, SanyoCCD, 0x??)}, */
1700 {USB_DEVICE(0x0c45, 0x6128), BSI(SN9C110, OM6802, 0x21)}, /*sn9c325?*/ 1704 {USB_DEVICE(0x0c45, 0x6128), BSI(SN9C110, OM6802, 0x21)}, /*sn9c325?*/
1701/*bw600.inf:*/ 1705/*bw600.inf:*/
1702 {USB_DEVICE(0x0c45, 0x612a), BSI(SN9C110, OV7648, 0x21)}, /*sn9c325?*/ 1706 {USB_DEVICE(0x0c45, 0x612a), BSI(SN9C120, OV7648, 0x21)}, /*sn9c110?*/
1703 {USB_DEVICE(0x0c45, 0x612c), BSI(SN9C110, MO4000, 0x21)}, 1707 {USB_DEVICE(0x0c45, 0x612c), BSI(SN9C110, MO4000, 0x21)},
1704 {USB_DEVICE(0x0c45, 0x612e), BSI(SN9C110, OV7630, 0x21)}, 1708 {USB_DEVICE(0x0c45, 0x612e), BSI(SN9C110, OV7630, 0x21)},
1705/* {USB_DEVICE(0x0c45, 0x612f), BSI(SN9C110, ICM105C, 0x??)}, */ 1709/* {USB_DEVICE(0x0c45, 0x612f), BSI(SN9C110, ICM105C, 0x??)}, */