[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>

diff --git a/drivers/media/video/gspca/nw80x.c b/drivers/media/video/gspca/nw80x.c
index 831748873884289ab85526ab10ec458d314cda66..e5928b1de53451e20aac9fcc64ea4d9abcd81e77 100644 (file)
--- a/drivers/media/video/gspca/nw80x.c
+++ b/drivers/media/video/gspca/nw80x.c
@@ -69,7 +69,6 @@ enum webcams {
        Mustek300,
        Proscope,
        Twinkle,
-       DsbC110,
        DvcV6,
        P35u,
        Generic802,
@@ -1426,183 +1425,6 @@ static const u8 twinkle_start[] = {
        0, 0, 0
 };
 
-/* et31x110 DSB-C110 */
-static const u8 dsbc110_init[] = {
-       0x04, 0x05, 0x01, 0x61,
-       0x04, 0x04, 0x01, 0x01,
-       0x04, 0x06, 0x01, 0x04,
-       0x04, 0x04, 0x03, 0x00, 0x00, 0x00,
-       0x05, 0x05, 0x01, 0x00,
-
-       0x04, 0x06, 0x01, 0x44,
-       0x04, 0x06, 0x01, 0x00,
-       0x00, 0x00, 0x40, 0x14, 0x83, 0x00, 0xba, 0x01, 0x10, 0x00, 0x4f,
-                         0xef, 0x00, 0x00, 0x60, 0x00, 0x01, 0x00, 0x19,
-                         0x00, 0x01, 0x00, 0x19, 0x00, 0x01, 0x00, 0x19,
-                         0x00, 0x01, 0x00, 0x19, 0x00, 0x06, 0x00, 0xfc,
-                         0x01, 0x3e, 0x00, 0x86, 0x00, 0x3e, 0x00, 0x86,
-                         0x00, 0x3e, 0x00, 0x86, 0x00, 0x01, 0x00, 0x01,
-                         0x00, 0x56, 0x00, 0x9e, 0x00, 0x56, 0x00, 0x9e,
-                         0x00, 0x56, 0x00, 0x9e, 0x00, 0x01, 0x00, 0x01,
-       0x00, 0x40, 0x40, 0x00, 0x6e, 0x00, 0xb6, 0x00, 0x6e, 0x00, 0x78,
-                         0x04, 0x6e, 0x00, 0xb6, 0x00, 0x01, 0x00, 0x01,
-                         0x00, 0x6e, 0x00, 0xb6, 0x00, 0x6e, 0x00, 0x78,
-                         0x04, 0x6e, 0x00, 0xb6, 0x00, 0x01, 0x00, 0x01,
-                         0x00, 0xca, 0x03, 0x46, 0x04, 0xca, 0x03, 0x46,
-                         0x04, 0x10, 0x00, 0x36, 0x00, 0xd2, 0x00, 0xee,
-                         0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0xf0,
-                         0x00, 0x3e, 0x00, 0xaa, 0x00, 0x88, 0x00, 0x2e,
-       0x00, 0x80, 0x1f, 0xb8, 0x48, 0x0f, 0x04, 0x88, 0x14, 0x68, 0x00,
-                         0x00, 0x00, 0x00, 0x00, 0xa8, 0x01, 0x00, 0x03,
-                         0x00, 0x24, 0x01, 0x01, 0x00, 0x16, 0x00, 0x04,
-                         0x00, 0x4b, 0x00, 0x76, 0x00, 0x86, 0x00,
-       0x02, 0x00, 0x12, 0x78, 0xa0, 0x9e, 0x78, 0xa0, 0x00, 0x00, 0x00,
-                         0x00, 0xf0, 0x18, 0x0b, 0x06, 0x62, 0x82, 0xa0,
-                         0x40, 0x20,
-       0x03, 0x00, 0x03, 0x03, 0x00, 0x00,
-       0x04, 0x00, 0x07, 0x01, 0x10, 0x00, 0x00, 0x00, 0x61, 0x00,
-       0x05, 0x00, 0x06, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00,
-       0x06, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x00,
-       0x08, 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x00, 0x00, 0x00,
-       0x10, 0x00, 0x40, 0x80, 0x02, 0x20, 0x00, 0x11, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x08, 0x08,
-                         0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                         0x00, 0x49, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00,
-                         0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x10, 0x08,
-                         0x03, 0x00, 0x00, 0x10, 0x00, 0x20, 0x10, 0x06,
-                         0xf7, 0xee, 0x1c, 0x1c, 0xe9, 0xfc, 0x00, 0x80,
-       0x10, 0x40, 0x40, 0x80, 0x00, 0x05, 0x35, 0x5e, 0x78, 0x8b, 0x99,
-                         0xa4, 0xae, 0xb5, 0xbc, 0xc1, 0xc6, 0xc9, 0xcc,
-                         0xcf, 0xd0, 0x00, 0x11, 0x22, 0x32, 0x43, 0x54,
-                         0x64, 0x74, 0x84, 0x94, 0xa4, 0xb3, 0xc3, 0xd2,
-                         0xe2, 0xf1, 0xff, 0x00, 0x11, 0x22, 0x32, 0x43,
-                         0x54, 0x64, 0x74, 0x84, 0x94, 0xa4, 0xb3, 0xc3,
-                         0xd2, 0xe2, 0xf1, 0xff, 0x00, 0x11, 0x22, 0x32,
-                         0x43, 0x54, 0x64, 0x74, 0x84, 0x94, 0xa4, 0xb3,
-       0x10, 0x80, 0x1d, 0xc3, 0xd2, 0xe2, 0xf1, 0xff, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x62,
-                         0x01, 0x24, 0x01, 0x62, 0x01, 0x24, 0x01, 0x20,
-                         0x01, 0x60, 0x01, 0x00, 0x00,
-       0x10, 0x85, 0x08, 0x00, 0x00, 0x3f, 0x01, 0x00, 0x00, 0xef, 0x00,
-       0x04, 0x04, 0x01, 0x10,
-       0x04, 0x04, 0x01, 0x00,
-       0x04, 0x05, 0x01, 0x61,
-       0x04, 0x04, 0x01, 0x01,
-#if 1
-       I2C0, 0x40, 0x0c, 0x02, 0x0c, 0x12, 0x07, 0x00, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x00, 0x0a,
-       I2C0, 0x40, 0x02, 0x11, 0x06,
-       I2C0, 0x40, 0x02, 0x14, 0x00,
-       I2C0, 0x40, 0x02, 0x13, 0x01,
-       I2C0, 0x40, 0x02, 0x07, 0x01,
-#else
-       0x06, 0x00, 0x0b, 0x0c, 0x12, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x0a,
-       0x06, 0x00, 0x0c, 0x02, 0x0c, 0x12, 0x07, 0x00, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x00, 0x0a,
-       0x05, 0x02, 0x02, 0x0c, 0x40,
-       0x05, 0x05, 0x01, 0x01,
-       0x06, 0x00, 0x01, 0x06,
-       0x06, 0x00, 0x02, 0x11, 0x06,
-       0x05, 0x02, 0x02, 0x02, 0x40,
-       0x05, 0x05, 0x01, 0x01,
-       0x06, 0x00, 0x01, 0x00,
-       0x06, 0x00, 0x02, 0x14, 0x00,
-       0x05, 0x02, 0x02, 0x02, 0x40,
-       0x05, 0x05, 0x01, 0x01,
-       0x06, 0x00, 0x01, 0x01,
-       0x06, 0x00, 0x02, 0x13, 0x01,
-       0x05, 0x02, 0x02, 0x02, 0x40,
-       0x05, 0x05, 0x01, 0x01,
-       0x06, 0x00, 0x01, 0x01,
-       0x06, 0x00, 0x02, 0x07, 0x01,
-       0x05, 0x02, 0x02, 0x02, 0x40,
-       0x05, 0x05, 0x01, 0x01,
-#endif
-       0x02, 0x00, 0x11, 0x3c, 0x50, 0x8c, 0x3c, 0x50, 0x00, 0x00, 0x00,
-                         0x00, 0x78, 0x3f, 0x3f, 0x06, 0xf2, 0x8f, 0xe4,
-                         0x40,
-#if 1
-       I2C0, 0x40, 0x02, 0x02, 0x0c,
-       I2C0, 0x40, 0x02, 0x13, 0x01,
-#else
-       0x06, 0x00, 0x01, 0x1c,
-       0x06, 0x00, 0x02, 0x02, 0x1c,
-       0x05, 0x02, 0x02, 0x02, 0x40,
-       0x05, 0x05, 0x01, 0x01,
-       0x06, 0x00, 0x01, 0x01,
-       0x06, 0x00, 0x02, 0x13, 0x01,
-       0x05, 0x02, 0x02, 0x02, 0x40,
-       0x05, 0x05, 0x01, 0x01,
-#endif
-       0x10, 0x00, 0x01, 0x01,
-       0x10, 0x8f, 0x0c, 0x62, 0x01, 0x24, 0x01, 0x62, 0x01, 0x24, 0x01,
-                         0xf0, 0x00, 0x40, 0x01,
-#if 1
-       I2C0, 0x40, 0x02, 0x05, 0x23,
-       I2C0, 0x40, 0x02, 0x13, 0x01,
-       I2C0, 0x40, 0x08, 0x08, 0x04, 0x0b, 0x01, 0x01, 0x02, 0x00, 0x00,
-       I2C0, 0x40, 0x03, 0x12, 0x00, 0x01,
-#else
-       0x06, 0x00, 0x01, 0x24,
-       0x06, 0x00, 0x02, 0x05, 0x24,
-       0x05, 0x02, 0x02, 0x02, 0x40,
-       0x05, 0x05, 0x01, 0x01,
-       0x06, 0x00, 0x01, 0x01,
-       0x06, 0x00, 0x02, 0x13, 0x01,
-       0x05, 0x02, 0x02, 0x02, 0x40,
-       0x05, 0x05, 0x01, 0x01,
-       0x06, 0x00, 0x07, 0x06, 0x0b, 0x01, 0x01, 0x02, 0x00, 0x00,
-       0x06, 0x00, 0x08, 0x08, 0x06, 0x0b, 0x01, 0x01, 0x02, 0x00, 0x00,
-       0x05, 0x02, 0x02, 0x08, 0x40,
-       0x05, 0x05, 0x01, 0x01,
-       0x06, 0x00, 0x02, 0x00, 0x01,
-       0x06, 0x00, 0x03, 0x12, 0x00, 0x01,
-       0x05, 0x02, 0x02, 0x03, 0x40,
-       0x05, 0x05, 0x01, 0x01,
-#endif
-       0x10, 0x11, 0x08, 0x00, 0x00, 0x3f, 0x01, 0x00, 0x00, 0xef, 0x00,
-#if 1
-       I2C0, 0x40, 0x02, 0x12, 0x00,
-       I2C0, 0x40, 0x02, 0x0e, 0x00,
-       I2C0, 0x40, 0x02, 0x11, 0x06,
-#else
-       0x06, 0x00, 0x01, 0x00,
-       0x06, 0x00, 0x02, 0x12, 0x00,
-       0x05, 0x02, 0x02, 0x02, 0x40,
-       0x05, 0x05, 0x01, 0x01,
-       0x06, 0x00, 0x01, 0x00,
-       0x06, 0x00, 0x02, 0x0e, 0x00,
-       0x05, 0x02, 0x02, 0x02, 0x40,
-       0x05, 0x05, 0x01, 0x01,
-       0x06, 0x00, 0x01, 0x06,
-       0x06, 0x00, 0x02, 0x11, 0x06,
-       0x05, 0x02, 0x02, 0x02, 0x40,
-       0x05, 0x05, 0x01, 0x01,
-#endif
-       0x10, 0x41, 0x11, 0x00, 0x17, 0x3f, 0x69, 0x7b, 0x8c, 0x9a, 0xa7,
-                         0xb3, 0xbf, 0xc9, 0xd3, 0xdd, 0xe6, 0xef, 0xf7,
-                         0xf9,
-       0x10, 0x03, 0x01, 0x00,
-       0x10, 0x0f, 0x02, 0x0c, 0x0c,
-       0x10, 0x03, 0x01, 0x06,
-       0x10, 0x41, 0x11, 0x00, 0x17, 0x3f, 0x69, 0x7b, 0x8c, 0x9a, 0xa7,
-                         0xb3, 0xbf, 0xc9, 0xd3, 0xdd, 0xe6, 0xef, 0xf7,
-                         0xf9,
-       0x10, 0x0b, 0x01, 0x14,
-       0x10, 0x0d, 0x01, 0x10,
-       0x10, 0x0c, 0x01, 0x1d,
-       0x04, 0x06, 0x01, 0x03,
-       0x04, 0x05, 0x01, 0x61,
-       0x04, 0x04, 0x01, 0x41,
-};
-
 /* nw802 dvc-v6 */
 static const u8 dvcv6_start[] = {
        0x04, 0x06, 0x01, 0x06,
@@ -1701,7 +1523,6 @@ static const u8 *webcam_start[] = {
        [Mustek300] = mustek_start,
        [Proscope] = proscope_init_1,
        [Twinkle] = twinkle_start,
-       [DsbC110] = dsbc110_init,
        [DvcV6] = dvcv6_start,
        [P35u] = nw801_start_1,
        [Generic802] = nw802_start,
@@ -2296,5 +2117,4 @@ MODULE_PARM_DESC(webcam,
        "8: Mustek Wcam 300 mini\n"
        "9: Scalar USB Microscope M2 (Proscope)\n"
        "10: Divio Chicony TwinkleCam\n"
-       "11: DSB-C110\n"
-       "12: DVC-V6\n");
+       "11: DVC-V6\n");