aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2011-03-22 04:37:18 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 15:38:18 -0400
commit94751d4b208281f8447a9baca39963b66dd6983f (patch)
tree1a9716a6ea62bbe3cc2b0866e377a561efe6d16d /drivers
parentc3ee142b44c868fb5e0eefe1b9c2df8115f6c69b (diff)
[media] gspca - nw80x: The webcam dsb-c110 is the same as the twinkle
Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/gspca/nw80x.c182
1 files changed, 1 insertions, 181 deletions
diff --git a/drivers/media/video/gspca/nw80x.c b/drivers/media/video/gspca/nw80x.c
index 831748873884..e5928b1de534 100644
--- a/drivers/media/video/gspca/nw80x.c
+++ b/drivers/media/video/gspca/nw80x.c
@@ -69,7 +69,6 @@ enum webcams {
69 Mustek300, 69 Mustek300,
70 Proscope, 70 Proscope,
71 Twinkle, 71 Twinkle,
72 DsbC110,
73 DvcV6, 72 DvcV6,
74 P35u, 73 P35u,
75 Generic802, 74 Generic802,
@@ -1426,183 +1425,6 @@ static const u8 twinkle_start[] = {
1426 0, 0, 0 1425 0, 0, 0
1427}; 1426};
1428 1427
1429/* et31x110 DSB-C110 */
1430static const u8 dsbc110_init[] = {
1431 0x04, 0x05, 0x01, 0x61,
1432 0x04, 0x04, 0x01, 0x01,
1433 0x04, 0x06, 0x01, 0x04,
1434 0x04, 0x04, 0x03, 0x00, 0x00, 0x00,
1435 0x05, 0x05, 0x01, 0x00,
1436
1437 0x04, 0x06, 0x01, 0x44,
1438 0x04, 0x06, 0x01, 0x00,
1439 0x00, 0x00, 0x40, 0x14, 0x83, 0x00, 0xba, 0x01, 0x10, 0x00, 0x4f,
1440 0xef, 0x00, 0x00, 0x60, 0x00, 0x01, 0x00, 0x19,
1441 0x00, 0x01, 0x00, 0x19, 0x00, 0x01, 0x00, 0x19,
1442 0x00, 0x01, 0x00, 0x19, 0x00, 0x06, 0x00, 0xfc,
1443 0x01, 0x3e, 0x00, 0x86, 0x00, 0x3e, 0x00, 0x86,
1444 0x00, 0x3e, 0x00, 0x86, 0x00, 0x01, 0x00, 0x01,
1445 0x00, 0x56, 0x00, 0x9e, 0x00, 0x56, 0x00, 0x9e,
1446 0x00, 0x56, 0x00, 0x9e, 0x00, 0x01, 0x00, 0x01,
1447 0x00, 0x40, 0x40, 0x00, 0x6e, 0x00, 0xb6, 0x00, 0x6e, 0x00, 0x78,
1448 0x04, 0x6e, 0x00, 0xb6, 0x00, 0x01, 0x00, 0x01,
1449 0x00, 0x6e, 0x00, 0xb6, 0x00, 0x6e, 0x00, 0x78,
1450 0x04, 0x6e, 0x00, 0xb6, 0x00, 0x01, 0x00, 0x01,
1451 0x00, 0xca, 0x03, 0x46, 0x04, 0xca, 0x03, 0x46,
1452 0x04, 0x10, 0x00, 0x36, 0x00, 0xd2, 0x00, 0xee,
1453 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0xf0,
1454 0x00, 0x3e, 0x00, 0xaa, 0x00, 0x88, 0x00, 0x2e,
1455 0x00, 0x80, 0x1f, 0xb8, 0x48, 0x0f, 0x04, 0x88, 0x14, 0x68, 0x00,
1456 0x00, 0x00, 0x00, 0x00, 0xa8, 0x01, 0x00, 0x03,
1457 0x00, 0x24, 0x01, 0x01, 0x00, 0x16, 0x00, 0x04,
1458 0x00, 0x4b, 0x00, 0x76, 0x00, 0x86, 0x00,
1459 0x02, 0x00, 0x12, 0x78, 0xa0, 0x9e, 0x78, 0xa0, 0x00, 0x00, 0x00,
1460 0x00, 0xf0, 0x18, 0x0b, 0x06, 0x62, 0x82, 0xa0,
1461 0x40, 0x20,
1462 0x03, 0x00, 0x03, 0x03, 0x00, 0x00,
1463 0x04, 0x00, 0x07, 0x01, 0x10, 0x00, 0x00, 0x00, 0x61, 0x00,
1464 0x05, 0x00, 0x06, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00,
1465 0x06, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1466 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1467 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1468 0x00, 0x00, 0x00,
1469 0x08, 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1470 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1471 0x00, 0x00, 0x00, 0x00, 0x00,
1472 0x10, 0x00, 0x40, 0x80, 0x02, 0x20, 0x00, 0x11, 0x00, 0x00, 0x00,
1473 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x08, 0x08,
1474 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
1475 0x00, 0x49, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00,
1476 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00,
1477 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x10, 0x08,
1478 0x03, 0x00, 0x00, 0x10, 0x00, 0x20, 0x10, 0x06,
1479 0xf7, 0xee, 0x1c, 0x1c, 0xe9, 0xfc, 0x00, 0x80,
1480 0x10, 0x40, 0x40, 0x80, 0x00, 0x05, 0x35, 0x5e, 0x78, 0x8b, 0x99,
1481 0xa4, 0xae, 0xb5, 0xbc, 0xc1, 0xc6, 0xc9, 0xcc,
1482 0xcf, 0xd0, 0x00, 0x11, 0x22, 0x32, 0x43, 0x54,
1483 0x64, 0x74, 0x84, 0x94, 0xa4, 0xb3, 0xc3, 0xd2,
1484 0xe2, 0xf1, 0xff, 0x00, 0x11, 0x22, 0x32, 0x43,
1485 0x54, 0x64, 0x74, 0x84, 0x94, 0xa4, 0xb3, 0xc3,
1486 0xd2, 0xe2, 0xf1, 0xff, 0x00, 0x11, 0x22, 0x32,
1487 0x43, 0x54, 0x64, 0x74, 0x84, 0x94, 0xa4, 0xb3,
1488 0x10, 0x80, 0x1d, 0xc3, 0xd2, 0xe2, 0xf1, 0xff, 0x00, 0x00, 0x00,
1489 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x62,
1490 0x01, 0x24, 0x01, 0x62, 0x01, 0x24, 0x01, 0x20,
1491 0x01, 0x60, 0x01, 0x00, 0x00,
1492 0x10, 0x85, 0x08, 0x00, 0x00, 0x3f, 0x01, 0x00, 0x00, 0xef, 0x00,
1493 0x04, 0x04, 0x01, 0x10,
1494 0x04, 0x04, 0x01, 0x00,
1495 0x04, 0x05, 0x01, 0x61,
1496 0x04, 0x04, 0x01, 0x01,
1497#if 1
1498 I2C0, 0x40, 0x0c, 0x02, 0x0c, 0x12, 0x07, 0x00, 0x00, 0x00, 0x00,
1499 0x00, 0x00, 0x00, 0x0a,
1500 I2C0, 0x40, 0x02, 0x11, 0x06,
1501 I2C0, 0x40, 0x02, 0x14, 0x00,
1502 I2C0, 0x40, 0x02, 0x13, 0x01,
1503 I2C0, 0x40, 0x02, 0x07, 0x01,
1504#else
1505 0x06, 0x00, 0x0b, 0x0c, 0x12, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
1506 0x00, 0x00, 0x0a,
1507 0x06, 0x00, 0x0c, 0x02, 0x0c, 0x12, 0x07, 0x00, 0x00, 0x00, 0x00,
1508 0x00, 0x00, 0x00, 0x0a,
1509 0x05, 0x02, 0x02, 0x0c, 0x40,
1510 0x05, 0x05, 0x01, 0x01,
1511 0x06, 0x00, 0x01, 0x06,
1512 0x06, 0x00, 0x02, 0x11, 0x06,
1513 0x05, 0x02, 0x02, 0x02, 0x40,
1514 0x05, 0x05, 0x01, 0x01,
1515 0x06, 0x00, 0x01, 0x00,
1516 0x06, 0x00, 0x02, 0x14, 0x00,
1517 0x05, 0x02, 0x02, 0x02, 0x40,
1518 0x05, 0x05, 0x01, 0x01,
1519 0x06, 0x00, 0x01, 0x01,
1520 0x06, 0x00, 0x02, 0x13, 0x01,
1521 0x05, 0x02, 0x02, 0x02, 0x40,
1522 0x05, 0x05, 0x01, 0x01,
1523 0x06, 0x00, 0x01, 0x01,
1524 0x06, 0x00, 0x02, 0x07, 0x01,
1525 0x05, 0x02, 0x02, 0x02, 0x40,
1526 0x05, 0x05, 0x01, 0x01,
1527#endif
1528 0x02, 0x00, 0x11, 0x3c, 0x50, 0x8c, 0x3c, 0x50, 0x00, 0x00, 0x00,
1529 0x00, 0x78, 0x3f, 0x3f, 0x06, 0xf2, 0x8f, 0xe4,
1530 0x40,
1531#if 1
1532 I2C0, 0x40, 0x02, 0x02, 0x0c,
1533 I2C0, 0x40, 0x02, 0x13, 0x01,
1534#else
1535 0x06, 0x00, 0x01, 0x1c,
1536 0x06, 0x00, 0x02, 0x02, 0x1c,
1537 0x05, 0x02, 0x02, 0x02, 0x40,
1538 0x05, 0x05, 0x01, 0x01,
1539 0x06, 0x00, 0x01, 0x01,
1540 0x06, 0x00, 0x02, 0x13, 0x01,
1541 0x05, 0x02, 0x02, 0x02, 0x40,
1542 0x05, 0x05, 0x01, 0x01,
1543#endif
1544 0x10, 0x00, 0x01, 0x01,
1545 0x10, 0x8f, 0x0c, 0x62, 0x01, 0x24, 0x01, 0x62, 0x01, 0x24, 0x01,
1546 0xf0, 0x00, 0x40, 0x01,
1547#if 1
1548 I2C0, 0x40, 0x02, 0x05, 0x23,
1549 I2C0, 0x40, 0x02, 0x13, 0x01,
1550 I2C0, 0x40, 0x08, 0x08, 0x04, 0x0b, 0x01, 0x01, 0x02, 0x00, 0x00,
1551 I2C0, 0x40, 0x03, 0x12, 0x00, 0x01,
1552#else
1553 0x06, 0x00, 0x01, 0x24,
1554 0x06, 0x00, 0x02, 0x05, 0x24,
1555 0x05, 0x02, 0x02, 0x02, 0x40,
1556 0x05, 0x05, 0x01, 0x01,
1557 0x06, 0x00, 0x01, 0x01,
1558 0x06, 0x00, 0x02, 0x13, 0x01,
1559 0x05, 0x02, 0x02, 0x02, 0x40,
1560 0x05, 0x05, 0x01, 0x01,
1561 0x06, 0x00, 0x07, 0x06, 0x0b, 0x01, 0x01, 0x02, 0x00, 0x00,
1562 0x06, 0x00, 0x08, 0x08, 0x06, 0x0b, 0x01, 0x01, 0x02, 0x00, 0x00,
1563 0x05, 0x02, 0x02, 0x08, 0x40,
1564 0x05, 0x05, 0x01, 0x01,
1565 0x06, 0x00, 0x02, 0x00, 0x01,
1566 0x06, 0x00, 0x03, 0x12, 0x00, 0x01,
1567 0x05, 0x02, 0x02, 0x03, 0x40,
1568 0x05, 0x05, 0x01, 0x01,
1569#endif
1570 0x10, 0x11, 0x08, 0x00, 0x00, 0x3f, 0x01, 0x00, 0x00, 0xef, 0x00,
1571#if 1
1572 I2C0, 0x40, 0x02, 0x12, 0x00,
1573 I2C0, 0x40, 0x02, 0x0e, 0x00,
1574 I2C0, 0x40, 0x02, 0x11, 0x06,
1575#else
1576 0x06, 0x00, 0x01, 0x00,
1577 0x06, 0x00, 0x02, 0x12, 0x00,
1578 0x05, 0x02, 0x02, 0x02, 0x40,
1579 0x05, 0x05, 0x01, 0x01,
1580 0x06, 0x00, 0x01, 0x00,
1581 0x06, 0x00, 0x02, 0x0e, 0x00,
1582 0x05, 0x02, 0x02, 0x02, 0x40,
1583 0x05, 0x05, 0x01, 0x01,
1584 0x06, 0x00, 0x01, 0x06,
1585 0x06, 0x00, 0x02, 0x11, 0x06,
1586 0x05, 0x02, 0x02, 0x02, 0x40,
1587 0x05, 0x05, 0x01, 0x01,
1588#endif
1589 0x10, 0x41, 0x11, 0x00, 0x17, 0x3f, 0x69, 0x7b, 0x8c, 0x9a, 0xa7,
1590 0xb3, 0xbf, 0xc9, 0xd3, 0xdd, 0xe6, 0xef, 0xf7,
1591 0xf9,
1592 0x10, 0x03, 0x01, 0x00,
1593 0x10, 0x0f, 0x02, 0x0c, 0x0c,
1594 0x10, 0x03, 0x01, 0x06,
1595 0x10, 0x41, 0x11, 0x00, 0x17, 0x3f, 0x69, 0x7b, 0x8c, 0x9a, 0xa7,
1596 0xb3, 0xbf, 0xc9, 0xd3, 0xdd, 0xe6, 0xef, 0xf7,
1597 0xf9,
1598 0x10, 0x0b, 0x01, 0x14,
1599 0x10, 0x0d, 0x01, 0x10,
1600 0x10, 0x0c, 0x01, 0x1d,
1601 0x04, 0x06, 0x01, 0x03,
1602 0x04, 0x05, 0x01, 0x61,
1603 0x04, 0x04, 0x01, 0x41,
1604};
1605
1606/* nw802 dvc-v6 */ 1428/* nw802 dvc-v6 */
1607static const u8 dvcv6_start[] = { 1429static const u8 dvcv6_start[] = {
1608 0x04, 0x06, 0x01, 0x06, 1430 0x04, 0x06, 0x01, 0x06,
@@ -1701,7 +1523,6 @@ static const u8 *webcam_start[] = {
1701 [Mustek300] = mustek_start, 1523 [Mustek300] = mustek_start,
1702 [Proscope] = proscope_init_1, 1524 [Proscope] = proscope_init_1,
1703 [Twinkle] = twinkle_start, 1525 [Twinkle] = twinkle_start,
1704 [DsbC110] = dsbc110_init,
1705 [DvcV6] = dvcv6_start, 1526 [DvcV6] = dvcv6_start,
1706 [P35u] = nw801_start_1, 1527 [P35u] = nw801_start_1,
1707 [Generic802] = nw802_start, 1528 [Generic802] = nw802_start,
@@ -2296,5 +2117,4 @@ MODULE_PARM_DESC(webcam,
2296 "8: Mustek Wcam 300 mini\n" 2117 "8: Mustek Wcam 300 mini\n"
2297 "9: Scalar USB Microscope M2 (Proscope)\n" 2118 "9: Scalar USB Microscope M2 (Proscope)\n"
2298 "10: Divio Chicony TwinkleCam\n" 2119 "10: Divio Chicony TwinkleCam\n"
2299 "11: DSB-C110\n" 2120 "11: DVC-V6\n");
2300 "12: DVC-V6\n");