V4L/DVB: gspca - vc032x: Change the ov7670 format to YUYV

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/vc032x.c b/drivers/media/video/gspca/vc032x.c
index 7fde145..732c3df 100644 (file)
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -1971,268 +1971,489 @@ static const u8 ov7660_NoFliker[][4] = {
        {}
 };
 
-static const u8 ov7670_initVGA_JPG[][4] = {
+static const u8 ov7670_InitVGA[][4] = {
        {0xb3, 0x01, 0x05, 0xcc},
-       {0x00, 0x00, 0x30, 0xdd},       {0xb0, 0x03, 0x19, 0xcc},
+       {0x00, 0x00, 0x30, 0xdd},
+       {0xb0, 0x03, 0x19, 0xcc},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0xb0, 0x04, 0x02, 0xcc},
        {0x00, 0x00, 0x10, 0xdd},
-       {0xb0, 0x04, 0x02, 0xcc},       {0x00, 0x00, 0x10, 0xdd},
-       {0xb3, 0x00, 0x66, 0xcc},       {0xb3, 0x00, 0x67, 0xcc},
+       {0xb3, 0x00, 0x66, 0xcc},
+       {0xb3, 0x00, 0x67, 0xcc},
+       {0xb0, 0x16, 0x01, 0xcc},
        {0xb3, 0x35, 0xa1, 0xcc},       /* i2c add: 21 */
        {0xb3, 0x34, 0x01, 0xcc},
-       {0xb3, 0x05, 0x01, 0xcc},       {0xb3, 0x06, 0x01, 0xcc},
-       {0xb3, 0x08, 0x01, 0xcc},       {0xb3, 0x09, 0x0c, 0xcc},
-       {0xb3, 0x02, 0x02, 0xcc},       {0xb3, 0x03, 0x1f, 0xcc},
-       {0xb3, 0x14, 0x00, 0xcc},       {0xb3, 0x15, 0x00, 0xcc},
-       {0xb3, 0x16, 0x02, 0xcc},       {0xb3, 0x17, 0x7f, 0xcc},
-       {0xb3, 0x04, 0x05, 0xcc},       {0xb3, 0x20, 0x00, 0xcc},
-       {0xb3, 0x21, 0x00, 0xcc},       {0xb3, 0x22, 0x01, 0xcc},
-       {0xb3, 0x23, 0xe0, 0xcc},       {0xbc, 0x00, 0x41, 0xcc},
-       {0xbc, 0x01, 0x01, 0xcc},       {0x00, 0x12, 0x80, 0xaa},
-       {0x00, 0x00, 0x20, 0xdd},       {0x00, 0x12, 0x00, 0xaa},
-       {0x00, 0x11, 0x40, 0xaa},       {0x00, 0x6b, 0x0a, 0xaa},
-       {0x00, 0x3a, 0x04, 0xaa},       {0x00, 0x40, 0xc0, 0xaa},
-       {0x00, 0x8c, 0x00, 0xaa},       {0x00, 0x7a, 0x29, 0xaa},
-       {0x00, 0x7b, 0x0e, 0xaa},       {0x00, 0x7c, 0x1a, 0xaa},
-       {0x00, 0x7d, 0x31, 0xaa},       {0x00, 0x7e, 0x53, 0xaa},
-       {0x00, 0x7f, 0x60, 0xaa},       {0x00, 0x80, 0x6b, 0xaa},
-       {0x00, 0x81, 0x73, 0xaa},       {0x00, 0x82, 0x7b, 0xaa},
-       {0x00, 0x83, 0x82, 0xaa},       {0x00, 0x84, 0x89, 0xaa},
-       {0x00, 0x85, 0x96, 0xaa},       {0x00, 0x86, 0xa1, 0xaa},
-       {0x00, 0x87, 0xb7, 0xaa},       {0x00, 0x88, 0xcc, 0xaa},
-       {0x00, 0x89, 0xe1, 0xaa},       {0x00, 0x13, 0xe0, 0xaa},
-       {0x00, 0x00, 0x00, 0xaa},       {0x00, 0x10, 0x00, 0xaa},
-       {0x00, 0x0d, 0x40, 0xaa},       {0x00, 0x14, 0x28, 0xaa},
-       {0x00, 0xa5, 0x05, 0xaa},       {0x00, 0xab, 0x07, 0xaa},
-       {0x00, 0x24, 0x95, 0xaa},       {0x00, 0x25, 0x33, 0xaa},
-       {0x00, 0x26, 0xe3, 0xaa},       {0x00, 0x9f, 0x88, 0xaa},
-       {0x00, 0xa0, 0x78, 0xaa},       {0x00, 0x55, 0x90, 0xaa},
-       {0x00, 0xa1, 0x03, 0xaa},       {0x00, 0xa6, 0xe0, 0xaa},
-       {0x00, 0xa7, 0xd8, 0xaa},       {0x00, 0xa8, 0xf0, 0xaa},
-       {0x00, 0xa9, 0x90, 0xaa},       {0x00, 0xaa, 0x14, 0xaa},
-       {0x00, 0x13, 0xe5, 0xaa},       {0x00, 0x0e, 0x61, 0xaa},
-       {0x00, 0x0f, 0x4b, 0xaa},       {0x00, 0x16, 0x02, 0xaa},
+       {0xb3, 0x05, 0x01, 0xcc},
+       {0xb3, 0x06, 0x01, 0xcc},
+       {0xb3, 0x08, 0x01, 0xcc},
+       {0xb3, 0x09, 0x0c, 0xcc},
+       {0xb3, 0x02, 0x02, 0xcc},
+       {0xb3, 0x03, 0x1f, 0xcc},
+       {0xb3, 0x14, 0x00, 0xcc},
+       {0xb3, 0x15, 0x00, 0xcc},
+       {0xb3, 0x16, 0x02, 0xcc},
+       {0xb3, 0x17, 0x7f, 0xcc},
+       {0xb3, 0x04, 0x05, 0xcc},
+       {0xb3, 0x20, 0x00, 0xcc},
+       {0xb3, 0x21, 0x00, 0xcc},
+       {0xb3, 0x22, 0x01, 0xcc},
+       {0xb3, 0x23, 0xe0, 0xcc},
+       {0xbc, 0x00, 0x41, 0xcc},
+       {0xbc, 0x01, 0x01, 0xcc},
+       {0x00, 0x12, 0x80, 0xaa},
+       {0x00, 0x00, 0x20, 0xdd},
+       {0x00, 0x12, 0x00, 0xaa},
+       {0x00, 0x11, 0x40, 0xaa},
+       {0x00, 0x6b, 0x0a, 0xaa},
+       {0x00, 0x3a, 0x04, 0xaa},
+       {0x00, 0x40, 0xc0, 0xaa},
+       {0x00, 0x8c, 0x00, 0xaa},
+       {0x00, 0x7a, 0x29, 0xaa},
+       {0x00, 0x7b, 0x0e, 0xaa},
+       {0x00, 0x7c, 0x1a, 0xaa},
+       {0x00, 0x7d, 0x31, 0xaa},
+       {0x00, 0x7e, 0x53, 0xaa},
+       {0x00, 0x7f, 0x60, 0xaa},
+       {0x00, 0x80, 0x6b, 0xaa},
+       {0x00, 0x81, 0x73, 0xaa},
+       {0x00, 0x82, 0x7b, 0xaa},
+       {0x00, 0x83, 0x82, 0xaa},
+       {0x00, 0x84, 0x89, 0xaa},
+       {0x00, 0x85, 0x96, 0xaa},
+       {0x00, 0x86, 0xa1, 0xaa},
+       {0x00, 0x87, 0xb7, 0xaa},
+       {0x00, 0x88, 0xcc, 0xaa},
+       {0x00, 0x89, 0xe1, 0xaa},
+       {0x00, 0x13, 0xe0, 0xaa},
+       {0x00, 0x00, 0x00, 0xaa},
+       {0x00, 0x10, 0x00, 0xaa},
+       {0x00, 0x0d, 0x40, 0xaa},
+       {0x00, 0x14, 0x28, 0xaa},
+       {0x00, 0xa5, 0x05, 0xaa},
+       {0x00, 0xab, 0x07, 0xaa},
+       {0x00, 0x24, 0x95, 0xaa},
+       {0x00, 0x25, 0x33, 0xaa},
+       {0x00, 0x26, 0xe3, 0xaa},
+       {0x00, 0x9f, 0x88, 0xaa},
+       {0x00, 0xa0, 0x78, 0xaa},
+       {0x00, 0x55, 0x90, 0xaa},
+       {0x00, 0xa1, 0x03, 0xaa},
+       {0x00, 0xa6, 0xe0, 0xaa},
+       {0x00, 0xa7, 0xd8, 0xaa},
+       {0x00, 0xa8, 0xf0, 0xaa},
+       {0x00, 0xa9, 0x90, 0xaa},
+       {0x00, 0xaa, 0x14, 0xaa},
+       {0x00, 0x13, 0xe5, 0xaa},
+       {0x00, 0x0e, 0x61, 0xaa},
+       {0x00, 0x0f, 0x4b, 0xaa},
+       {0x00, 0x16, 0x02, 0xaa},
        {0x00, 0x1e, 0x07, 0xaa},       /* MVFP */
        {0x00, 0x21, 0x02, 0xaa},
-       {0x00, 0x22, 0x91, 0xaa},       {0x00, 0x29, 0x07, 0xaa},
-       {0x00, 0x33, 0x0b, 0xaa},       {0x00, 0x35, 0x0b, 0xaa},
-       {0x00, 0x37, 0x1d, 0xaa},       {0x00, 0x38, 0x71, 0xaa},
-       {0x00, 0x39, 0x2a, 0xaa},       {0x00, 0x3c, 0x78, 0xaa},
-       {0x00, 0x4d, 0x40, 0xaa},       {0x00, 0x4e, 0x20, 0xaa},
-       {0x00, 0x74, 0x19, 0xaa},       {0x00, 0x8d, 0x4f, 0xaa},
-       {0x00, 0x8e, 0x00, 0xaa},       {0x00, 0x8f, 0x00, 0xaa},
-       {0x00, 0x90, 0x00, 0xaa},       {0x00, 0x91, 0x00, 0xaa},
-       {0x00, 0x96, 0x00, 0xaa},       {0x00, 0x9a, 0x80, 0xaa},
-       {0x00, 0xb0, 0x84, 0xaa},       {0x00, 0xb1, 0x0c, 0xaa},
-       {0x00, 0xb2, 0x0e, 0xaa},       {0x00, 0xb3, 0x82, 0xaa},
-       {0x00, 0xb8, 0x0a, 0xaa},       {0x00, 0x43, 0x14, 0xaa},
-       {0x00, 0x44, 0xf0, 0xaa},       {0x00, 0x45, 0x45, 0xaa},
-       {0x00, 0x46, 0x63, 0xaa},       {0x00, 0x47, 0x2d, 0xaa},
-       {0x00, 0x48, 0x46, 0xaa},       {0x00, 0x59, 0x88, 0xaa},
-       {0x00, 0x5a, 0xa0, 0xaa},       {0x00, 0x5b, 0xc6, 0xaa},
-       {0x00, 0x5c, 0x7d, 0xaa},       {0x00, 0x5d, 0x5f, 0xaa},
-       {0x00, 0x5e, 0x19, 0xaa},       {0x00, 0x6c, 0x0a, 0xaa},
-       {0x00, 0x6d, 0x55, 0xaa},       {0x00, 0x6e, 0x11, 0xaa},
-       {0x00, 0x6f, 0x9e, 0xaa},       {0x00, 0x69, 0x00, 0xaa},
-       {0x00, 0x6a, 0x40, 0xaa},       {0x00, 0x01, 0x40, 0xaa},
-       {0x00, 0x02, 0x40, 0xaa},       {0x00, 0x13, 0xe7, 0xaa},
-       {0x00, 0x5f, 0xf0, 0xaa},       {0x00, 0x60, 0xf0, 0xaa},
-       {0x00, 0x61, 0xf0, 0xaa},       {0x00, 0x27, 0xa0, 0xaa},
-       {0x00, 0x28, 0x80, 0xaa},       {0x00, 0x2c, 0x90, 0xaa},
-       {0x00, 0x4f, 0x66, 0xaa},       {0x00, 0x50, 0x66, 0xaa},
-       {0x00, 0x51, 0x00, 0xaa},       {0x00, 0x52, 0x22, 0xaa},
-       {0x00, 0x53, 0x5e, 0xaa},       {0x00, 0x54, 0x80, 0xaa},
-       {0x00, 0x58, 0x9e, 0xaa},       {0x00, 0x41, 0x08, 0xaa},
-       {0x00, 0x3f, 0x00, 0xaa},       {0x00, 0x75, 0x85, 0xaa},
-       {0x00, 0x76, 0xe1, 0xaa},       {0x00, 0x4c, 0x00, 0xaa},
-       {0x00, 0x77, 0x0a, 0xaa},       {0x00, 0x3d, 0x88, 0xaa},
-       {0x00, 0x4b, 0x09, 0xaa},       {0x00, 0xc9, 0x60, 0xaa},
-       {0x00, 0x41, 0x38, 0xaa},       {0x00, 0x62, 0x30, 0xaa},
-       {0x00, 0x63, 0x30, 0xaa},       {0x00, 0x64, 0x08, 0xaa},
-       {0x00, 0x94, 0x07, 0xaa},       {0x00, 0x95, 0x0b, 0xaa},
-       {0x00, 0x65, 0x00, 0xaa},       {0x00, 0x66, 0x05, 0xaa},
-       {0x00, 0x56, 0x50, 0xaa},       {0x00, 0x34, 0x11, 0xaa},
-       {0x00, 0xa4, 0x88, 0xaa},       {0x00, 0x96, 0x00, 0xaa},
-       {0x00, 0x97, 0x30, 0xaa},       {0x00, 0x98, 0x20, 0xaa},
-       {0x00, 0x99, 0x30, 0xaa},       {0x00, 0x9a, 0x84, 0xaa},
-       {0x00, 0x9b, 0x29, 0xaa},       {0x00, 0x9c, 0x03, 0xaa},
-       {0x00, 0x78, 0x04, 0xaa},       {0x00, 0x79, 0x01, 0xaa},
-       {0x00, 0xc8, 0xf0, 0xaa},       {0x00, 0x79, 0x0f, 0xaa},
-       {0x00, 0xc8, 0x00, 0xaa},       {0x00, 0x79, 0x10, 0xaa},
-       {0x00, 0xc8, 0x7e, 0xaa},       {0x00, 0x79, 0x0a, 0xaa},
-       {0x00, 0xc8, 0x80, 0xaa},       {0x00, 0x79, 0x0b, 0xaa},
-       {0x00, 0xc8, 0x01, 0xaa},       {0x00, 0x79, 0x0c, 0xaa},
-       {0x00, 0xc8, 0x0f, 0xaa},       {0x00, 0x79, 0x0d, 0xaa},
-       {0x00, 0xc8, 0x20, 0xaa},       {0x00, 0x79, 0x09, 0xaa},
-       {0x00, 0xc8, 0x80, 0xaa},       {0x00, 0x79, 0x02, 0xaa},
-       {0x00, 0xc8, 0xc0, 0xaa},       {0x00, 0x79, 0x03, 0xaa},
-       {0x00, 0xc8, 0x40, 0xaa},       {0x00, 0x79, 0x05, 0xaa},
-       {0x00, 0xc8, 0x30, 0xaa},       {0x00, 0x79, 0x26, 0xaa},
-       {0x00, 0x11, 0x40, 0xaa},       {0x00, 0x3a, 0x04, 0xaa},
-       {0x00, 0x12, 0x00, 0xaa},       {0x00, 0x40, 0xc0, 0xaa},
-       {0x00, 0x8c, 0x00, 0xaa},       {0x00, 0x17, 0x14, 0xaa},
-       {0x00, 0x18, 0x02, 0xaa},       {0x00, 0x32, 0x92, 0xaa},
-       {0x00, 0x19, 0x02, 0xaa},       {0x00, 0x1a, 0x7a, 0xaa},
-       {0x00, 0x03, 0x0a, 0xaa},       {0x00, 0x0c, 0x00, 0xaa},
-       {0x00, 0x3e, 0x00, 0xaa},       {0x00, 0x70, 0x3a, 0xaa},
-       {0x00, 0x71, 0x35, 0xaa},       {0x00, 0x72, 0x11, 0xaa},
-       {0x00, 0x73, 0xf0, 0xaa},       {0x00, 0xa2, 0x02, 0xaa},
-       {0x00, 0xb1, 0x00, 0xaa},       {0x00, 0xb1, 0x0c, 0xaa},
+       {0x00, 0x22, 0x91, 0xaa},
+       {0x00, 0x29, 0x07, 0xaa},
+       {0x00, 0x33, 0x0b, 0xaa},
+       {0x00, 0x35, 0x0b, 0xaa},
+       {0x00, 0x37, 0x1d, 0xaa},
+       {0x00, 0x38, 0x71, 0xaa},
+       {0x00, 0x39, 0x2a, 0xaa},
+       {0x00, 0x3c, 0x78, 0xaa},
+       {0x00, 0x4d, 0x40, 0xaa},
+       {0x00, 0x4e, 0x20, 0xaa},
+       {0x00, 0x74, 0x19, 0xaa},
+       {0x00, 0x8d, 0x4f, 0xaa},
+       {0x00, 0x8e, 0x00, 0xaa},
+       {0x00, 0x8f, 0x00, 0xaa},
+       {0x00, 0x90, 0x00, 0xaa},
+       {0x00, 0x91, 0x00, 0xaa},
+       {0x00, 0x96, 0x00, 0xaa},
+       {0x00, 0x9a, 0x80, 0xaa},
+       {0x00, 0xb0, 0x84, 0xaa},
+       {0x00, 0xb1, 0x0c, 0xaa},
+       {0x00, 0xb2, 0x0e, 0xaa},
+       {0x00, 0xb3, 0x82, 0xaa},
+       {0x00, 0xb8, 0x0a, 0xaa},
+       {0x00, 0x43, 0x14, 0xaa},
+       {0x00, 0x44, 0xf0, 0xaa},
+       {0x00, 0x45, 0x45, 0xaa},
+       {0x00, 0x46, 0x63, 0xaa},
+       {0x00, 0x47, 0x2d, 0xaa},
+       {0x00, 0x48, 0x46, 0xaa},
+       {0x00, 0x59, 0x88, 0xaa},
+       {0x00, 0x5a, 0xa0, 0xaa},
+       {0x00, 0x5b, 0xc6, 0xaa},
+       {0x00, 0x5c, 0x7d, 0xaa},
+       {0x00, 0x5d, 0x5f, 0xaa},
+       {0x00, 0x5e, 0x19, 0xaa},
+       {0x00, 0x6c, 0x0a, 0xaa},
+       {0x00, 0x6d, 0x55, 0xaa},
+       {0x00, 0x6e, 0x11, 0xaa},
+       {0x00, 0x6f, 0x9e, 0xaa},
+       {0x00, 0x69, 0x00, 0xaa},
+       {0x00, 0x6a, 0x40, 0xaa},
+       {0x00, 0x01, 0x40, 0xaa},
+       {0x00, 0x02, 0x40, 0xaa},
+       {0x00, 0x13, 0xe7, 0xaa},
+       {0x00, 0x5f, 0xf0, 0xaa},
+       {0x00, 0x60, 0xf0, 0xaa},
+       {0x00, 0x61, 0xf0, 0xaa},
+       {0x00, 0x27, 0xa0, 0xaa},
+       {0x00, 0x28, 0x80, 0xaa},
+       {0x00, 0x2c, 0x90, 0xaa},
+       {0x00, 0x4f, 0x66, 0xaa},
+       {0x00, 0x50, 0x66, 0xaa},
+       {0x00, 0x51, 0x00, 0xaa},
+       {0x00, 0x52, 0x22, 0xaa},
+       {0x00, 0x53, 0x5e, 0xaa},
+       {0x00, 0x54, 0x80, 0xaa},
+       {0x00, 0x58, 0x9e, 0xaa},
+       {0x00, 0x41, 0x08, 0xaa},
+       {0x00, 0x3f, 0x00, 0xaa},
+       {0x00, 0x75, 0x85, 0xaa},
+       {0x00, 0x76, 0xe1, 0xaa},
+       {0x00, 0x4c, 0x00, 0xaa},
+       {0x00, 0x77, 0x0a, 0xaa},
+       {0x00, 0x3d, 0x88, 0xaa},
+       {0x00, 0x4b, 0x09, 0xaa},
+       {0x00, 0xc9, 0x60, 0xaa},
+       {0x00, 0x41, 0x38, 0xaa},
+       {0x00, 0x62, 0x30, 0xaa},
+       {0x00, 0x63, 0x30, 0xaa},
+       {0x00, 0x64, 0x08, 0xaa},
+       {0x00, 0x94, 0x07, 0xaa},
+       {0x00, 0x95, 0x0b, 0xaa},
+       {0x00, 0x65, 0x00, 0xaa},
+       {0x00, 0x66, 0x05, 0xaa},
+       {0x00, 0x56, 0x50, 0xaa},
+       {0x00, 0x34, 0x11, 0xaa},
+       {0x00, 0xa4, 0x88, 0xaa},
+       {0x00, 0x96, 0x00, 0xaa},
+       {0x00, 0x97, 0x30, 0xaa},
+       {0x00, 0x98, 0x20, 0xaa},
+       {0x00, 0x99, 0x30, 0xaa},
+       {0x00, 0x9a, 0x84, 0xaa},
+       {0x00, 0x9b, 0x29, 0xaa},
+       {0x00, 0x9c, 0x03, 0xaa},
+       {0x00, 0x78, 0x04, 0xaa},
+       {0x00, 0x79, 0x01, 0xaa},
+       {0x00, 0xc8, 0xf0, 0xaa},
+       {0x00, 0x79, 0x0f, 0xaa},
+       {0x00, 0xc8, 0x00, 0xaa},
+       {0x00, 0x79, 0x10, 0xaa},
+       {0x00, 0xc8, 0x7e, 0xaa},
+       {0x00, 0x79, 0x0a, 0xaa},
+       {0x00, 0xc8, 0x80, 0xaa},
+       {0x00, 0x79, 0x0b, 0xaa},
+       {0x00, 0xc8, 0x01, 0xaa},
+       {0x00, 0x79, 0x0c, 0xaa},
+       {0x00, 0xc8, 0x0f, 0xaa},
+       {0x00, 0x79, 0x0d, 0xaa},
+       {0x00, 0xc8, 0x20, 0xaa},
+       {0x00, 0x79, 0x09, 0xaa},
+       {0x00, 0xc8, 0x80, 0xaa},
+       {0x00, 0x79, 0x02, 0xaa},
+       {0x00, 0xc8, 0xc0, 0xaa},
+       {0x00, 0x79, 0x03, 0xaa},
+       {0x00, 0xc8, 0x40, 0xaa},
+       {0x00, 0x79, 0x05, 0xaa},
+       {0x00, 0xc8, 0x30, 0xaa},
+       {0x00, 0x79, 0x26, 0xaa},
+       {0x00, 0x11, 0x40, 0xaa},
+       {0x00, 0x3a, 0x04, 0xaa},
+       {0x00, 0x12, 0x00, 0xaa},
+       {0x00, 0x40, 0xc0, 0xaa},
+       {0x00, 0x8c, 0x00, 0xaa},
+       {0x00, 0x17, 0x14, 0xaa},
+       {0x00, 0x18, 0x02, 0xaa},
+       {0x00, 0x32, 0x92, 0xaa},
+       {0x00, 0x19, 0x02, 0xaa},
+       {0x00, 0x1a, 0x7a, 0xaa},
+       {0x00, 0x03, 0x0a, 0xaa},
+       {0x00, 0x0c, 0x00, 0xaa},
+       {0x00, 0x3e, 0x00, 0xaa},
+       {0x00, 0x70, 0x3a, 0xaa},
+       {0x00, 0x71, 0x35, 0xaa},
+       {0x00, 0x72, 0x11, 0xaa},
+       {0x00, 0x73, 0xf0, 0xaa},
+       {0x00, 0xa2, 0x02, 0xaa},
+       {0x00, 0xb1, 0x00, 0xaa},
+       {0x00, 0xb1, 0x0c, 0xaa},
        {0x00, 0x1e, 0x37, 0xaa},       /* MVFP */
        {0x00, 0xaa, 0x14, 0xaa},
-       {0x00, 0x24, 0x80, 0xaa},       {0x00, 0x25, 0x74, 0xaa},
-       {0x00, 0x26, 0xd3, 0xaa},       {0x00, 0x0d, 0x00, 0xaa},
-       {0x00, 0x14, 0x18, 0xaa},       {0x00, 0x9d, 0x99, 0xaa},
-       {0x00, 0x9e, 0x7f, 0xaa},       {0x00, 0x64, 0x08, 0xaa},
-       {0x00, 0x94, 0x07, 0xaa},       {0x00, 0x95, 0x06, 0xaa},
-       {0x00, 0x66, 0x05, 0xaa},       {0x00, 0x41, 0x08, 0xaa},
-       {0x00, 0x3f, 0x00, 0xaa},       {0x00, 0x75, 0x07, 0xaa},
-       {0x00, 0x76, 0xe1, 0xaa},       {0x00, 0x4c, 0x00, 0xaa},
-       {0x00, 0x77, 0x00, 0xaa},       {0x00, 0x3d, 0xc2, 0xaa},
-       {0x00, 0x4b, 0x09, 0xaa},       {0x00, 0xc9, 0x60, 0xaa},
-       {0x00, 0x41, 0x38, 0xaa},       {0xb6, 0x00, 0x00, 0xcc},
-       {0xb6, 0x03, 0x02, 0xcc},       {0xb6, 0x02, 0x80, 0xcc},
-       {0xb6, 0x05, 0x01, 0xcc},       {0xb6, 0x04, 0xe0, 0xcc},
-       {0xb6, 0x12, 0xf8, 0xcc},       {0xb6, 0x13, 0x13, 0xcc},
-       {0xb6, 0x18, 0x02, 0xcc},       {0xb6, 0x17, 0x58, 0xcc},
-       {0xb6, 0x16, 0x00, 0xcc},       {0xb6, 0x22, 0x12, 0xcc},
-       {0xb6, 0x23, 0x0b, 0xcc},       {0xbf, 0xc0, 0x39, 0xcc},
-       {0xbf, 0xc1, 0x04, 0xcc},       {0xbf, 0xcc, 0x00, 0xcc},
-       {0xb3, 0x5c, 0x01, 0xcc},       {0xb3, 0x01, 0x45, 0xcc},
+       {0x00, 0x24, 0x80, 0xaa},
+       {0x00, 0x25, 0x74, 0xaa},
+       {0x00, 0x26, 0xd3, 0xaa},
+       {0x00, 0x0d, 0x00, 0xaa},
+       {0x00, 0x14, 0x18, 0xaa},
+       {0x00, 0x9d, 0x99, 0xaa},
+       {0x00, 0x9e, 0x7f, 0xaa},
+       {0x00, 0x64, 0x08, 0xaa},
+       {0x00, 0x94, 0x07, 0xaa},
+       {0x00, 0x95, 0x06, 0xaa},
+       {0x00, 0x66, 0x05, 0xaa},
+       {0x00, 0x41, 0x08, 0xaa},
+       {0x00, 0x3f, 0x00, 0xaa},
+       {0x00, 0x75, 0x07, 0xaa},
+       {0x00, 0x76, 0xe1, 0xaa},
+       {0x00, 0x4c, 0x00, 0xaa},
+       {0x00, 0x77, 0x00, 0xaa},
+       {0x00, 0x3d, 0xc2, 0xaa},
+       {0x00, 0x4b, 0x09, 0xaa},
+       {0x00, 0xc9, 0x60, 0xaa},
+       {0x00, 0x41, 0x38, 0xaa},
+       {0xbf, 0xc0, 0x26, 0xcc},
+       {0xbf, 0xc1, 0x02, 0xcc},
+       {0xbf, 0xcc, 0x04, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {0xb3, 0x01, 0x45, 0xcc},
        {0x00, 0x77, 0x05, 0xaa},
        {},
 };
 
-static const u8 ov7670_initQVGA_JPG[][4] = {
-       {0xb3, 0x01, 0x05, 0xcc},       {0x00, 0x00, 0x30, 0xdd},
-       {0xb0, 0x03, 0x19, 0xcc},       {0x00, 0x00, 0x10, 0xdd},
-       {0xb0, 0x04, 0x02, 0xcc},       {0x00, 0x00, 0x10, 0xdd},
-       {0xb3, 0x00, 0x66, 0xcc},       {0xb3, 0x00, 0x67, 0xcc},
-       {0xb3, 0x35, 0xa1, 0xcc},       {0xb3, 0x34, 0x01, 0xcc},
-       {0xb3, 0x05, 0x01, 0xcc},       {0xb3, 0x06, 0x01, 0xcc},
-       {0xb3, 0x08, 0x01, 0xcc},       {0xb3, 0x09, 0x0c, 0xcc},
-       {0xb3, 0x02, 0x02, 0xcc},       {0xb3, 0x03, 0x1f, 0xcc},
-       {0xb3, 0x14, 0x00, 0xcc},       {0xb3, 0x15, 0x00, 0xcc},
-       {0xb3, 0x16, 0x02, 0xcc},       {0xb3, 0x17, 0x7f, 0xcc},
-       {0xb3, 0x04, 0x05, 0xcc},       {0xb3, 0x20, 0x00, 0xcc},
-       {0xb3, 0x21, 0x00, 0xcc},       {0xb3, 0x22, 0x01, 0xcc},
-       {0xb3, 0x23, 0xe0, 0xcc},       {0xbc, 0x00, 0xd1, 0xcc},
-       {0xbc, 0x01, 0x01, 0xcc},       {0x00, 0x12, 0x80, 0xaa},
-       {0x00, 0x00, 0x20, 0xdd},       {0x00, 0x12, 0x00, 0xaa},
-       {0x00, 0x11, 0x40, 0xaa},       {0x00, 0x6b, 0x0a, 0xaa},
-       {0x00, 0x3a, 0x04, 0xaa},       {0x00, 0x40, 0xc0, 0xaa},
-       {0x00, 0x8c, 0x00, 0xaa},       {0x00, 0x7a, 0x29, 0xaa},
-       {0x00, 0x7b, 0x0e, 0xaa},       {0x00, 0x7c, 0x1a, 0xaa},
-       {0x00, 0x7d, 0x31, 0xaa},       {0x00, 0x7e, 0x53, 0xaa},
-       {0x00, 0x7f, 0x60, 0xaa},       {0x00, 0x80, 0x6b, 0xaa},
-       {0x00, 0x81, 0x73, 0xaa},       {0x00, 0x82, 0x7b, 0xaa},
-       {0x00, 0x83, 0x82, 0xaa},       {0x00, 0x84, 0x89, 0xaa},
-       {0x00, 0x85, 0x96, 0xaa},       {0x00, 0x86, 0xa1, 0xaa},
-       {0x00, 0x87, 0xb7, 0xaa},       {0x00, 0x88, 0xcc, 0xaa},
-       {0x00, 0x89, 0xe1, 0xaa},       {0x00, 0x13, 0xe0, 0xaa},
-       {0x00, 0x00, 0x00, 0xaa},       {0x00, 0x10, 0x00, 0xaa},
-       {0x00, 0x0d, 0x40, 0xaa},       {0x00, 0x14, 0x28, 0xaa},
-       {0x00, 0xa5, 0x05, 0xaa},       {0x00, 0xab, 0x07, 0xaa},
-       {0x00, 0x24, 0x95, 0xaa},       {0x00, 0x25, 0x33, 0xaa},
-       {0x00, 0x26, 0xe3, 0xaa},       {0x00, 0x9f, 0x88, 0xaa},
-       {0x00, 0xa0, 0x78, 0xaa},       {0x00, 0x55, 0x90, 0xaa},
-       {0x00, 0xa1, 0x03, 0xaa},       {0x00, 0xa6, 0xe0, 0xaa},
-       {0x00, 0xa7, 0xd8, 0xaa},       {0x00, 0xa8, 0xf0, 0xaa},
-       {0x00, 0xa9, 0x90, 0xaa},       {0x00, 0xaa, 0x14, 0xaa},
-       {0x00, 0x13, 0xe5, 0xaa},       {0x00, 0x0e, 0x61, 0xaa},
-       {0x00, 0x0f, 0x4b, 0xaa},       {0x00, 0x16, 0x02, 0xaa},
+static const u8 ov7670_InitQVGA[][4] = {
+       {0xb3, 0x01, 0x05, 0xcc},
+       {0x00, 0x00, 0x30, 0xdd},
+       {0xb0, 0x03, 0x19, 0xcc},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0xb0, 0x04, 0x02, 0xcc},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0xb3, 0x00, 0x66, 0xcc},
+       {0xb3, 0x00, 0x67, 0xcc},
+       {0xb0, 0x16, 0x01, 0xcc},
+       {0xb3, 0x35, 0xa1, 0xcc},       /* i2c add: 21 */
+       {0xb3, 0x34, 0x01, 0xcc},
+       {0xb3, 0x05, 0x01, 0xcc},
+       {0xb3, 0x06, 0x01, 0xcc},
+       {0xb3, 0x08, 0x01, 0xcc},
+       {0xb3, 0x09, 0x0c, 0xcc},
+       {0xb3, 0x02, 0x02, 0xcc},
+       {0xb3, 0x03, 0x1f, 0xcc},
+       {0xb3, 0x14, 0x00, 0xcc},
+       {0xb3, 0x15, 0x00, 0xcc},
+       {0xb3, 0x16, 0x02, 0xcc},
+       {0xb3, 0x17, 0x7f, 0xcc},
+       {0xb3, 0x04, 0x05, 0xcc},
+       {0xb3, 0x20, 0x00, 0xcc},
+       {0xb3, 0x21, 0x00, 0xcc},
+       {0xb3, 0x22, 0x01, 0xcc},
+       {0xb3, 0x23, 0xe0, 0xcc},
+       {0xbc, 0x00, 0xd1, 0xcc},
+       {0xbc, 0x01, 0x01, 0xcc},
+       {0x00, 0x12, 0x80, 0xaa},
+       {0x00, 0x00, 0x20, 0xdd},
+       {0x00, 0x12, 0x00, 0xaa},
+       {0x00, 0x11, 0x40, 0xaa},
+       {0x00, 0x6b, 0x0a, 0xaa},
+       {0x00, 0x3a, 0x04, 0xaa},
+       {0x00, 0x40, 0xc0, 0xaa},
+       {0x00, 0x8c, 0x00, 0xaa},
+       {0x00, 0x7a, 0x29, 0xaa},
+       {0x00, 0x7b, 0x0e, 0xaa},
+       {0x00, 0x7c, 0x1a, 0xaa},
+       {0x00, 0x7d, 0x31, 0xaa},
+       {0x00, 0x7e, 0x53, 0xaa},
+       {0x00, 0x7f, 0x60, 0xaa},
+       {0x00, 0x80, 0x6b, 0xaa},
+       {0x00, 0x81, 0x73, 0xaa},
+       {0x00, 0x82, 0x7b, 0xaa},
+       {0x00, 0x83, 0x82, 0xaa},
+       {0x00, 0x84, 0x89, 0xaa},
+       {0x00, 0x85, 0x96, 0xaa},
+       {0x00, 0x86, 0xa1, 0xaa},
+       {0x00, 0x87, 0xb7, 0xaa},
+       {0x00, 0x88, 0xcc, 0xaa},
+       {0x00, 0x89, 0xe1, 0xaa},
+       {0x00, 0x13, 0xe0, 0xaa},
+       {0x00, 0x00, 0x00, 0xaa},
+       {0x00, 0x10, 0x00, 0xaa},
+       {0x00, 0x0d, 0x40, 0xaa},
+       {0x00, 0x14, 0x28, 0xaa},
+       {0x00, 0xa5, 0x05, 0xaa},
+       {0x00, 0xab, 0x07, 0xaa},
+       {0x00, 0x24, 0x95, 0xaa},
+       {0x00, 0x25, 0x33, 0xaa},
+       {0x00, 0x26, 0xe3, 0xaa},
+       {0x00, 0x9f, 0x88, 0xaa},
+       {0x00, 0xa0, 0x78, 0xaa},
+       {0x00, 0x55, 0x90, 0xaa},
+       {0x00, 0xa1, 0x03, 0xaa},
+       {0x00, 0xa6, 0xe0, 0xaa},
+       {0x00, 0xa7, 0xd8, 0xaa},
+       {0x00, 0xa8, 0xf0, 0xaa},
+       {0x00, 0xa9, 0x90, 0xaa},
+       {0x00, 0xaa, 0x14, 0xaa},
+       {0x00, 0x13, 0xe5, 0xaa},
+       {0x00, 0x0e, 0x61, 0xaa},
+       {0x00, 0x0f, 0x4b, 0xaa},
+       {0x00, 0x16, 0x02, 0xaa},
        {0x00, 0x1e, 0x07, 0xaa},       /* MVFP */
        {0x00, 0x21, 0x02, 0xaa},
-       {0x00, 0x22, 0x91, 0xaa},       {0x00, 0x29, 0x07, 0xaa},
-       {0x00, 0x33, 0x0b, 0xaa},       {0x00, 0x35, 0x0b, 0xaa},
-       {0x00, 0x37, 0x1d, 0xaa},       {0x00, 0x38, 0x71, 0xaa},
-       {0x00, 0x39, 0x2a, 0xaa},       {0x00, 0x3c, 0x78, 0xaa},
-       {0x00, 0x4d, 0x40, 0xaa},       {0x00, 0x4e, 0x20, 0xaa},
-       {0x00, 0x74, 0x19, 0xaa},       {0x00, 0x8d, 0x4f, 0xaa},
-       {0x00, 0x8e, 0x00, 0xaa},       {0x00, 0x8f, 0x00, 0xaa},
-       {0x00, 0x90, 0x00, 0xaa},       {0x00, 0x91, 0x00, 0xaa},
-       {0x00, 0x96, 0x00, 0xaa},       {0x00, 0x9a, 0x80, 0xaa},
-       {0x00, 0xb0, 0x84, 0xaa},       {0x00, 0xb1, 0x0c, 0xaa},
-       {0x00, 0xb2, 0x0e, 0xaa},       {0x00, 0xb3, 0x82, 0xaa},
-       {0x00, 0xb8, 0x0a, 0xaa},       {0x00, 0x43, 0x14, 0xaa},
-       {0x00, 0x44, 0xf0, 0xaa},       {0x00, 0x45, 0x45, 0xaa},
-       {0x00, 0x46, 0x63, 0xaa},       {0x00, 0x47, 0x2d, 0xaa},
-       {0x00, 0x48, 0x46, 0xaa},       {0x00, 0x59, 0x88, 0xaa},
-       {0x00, 0x5a, 0xa0, 0xaa},       {0x00, 0x5b, 0xc6, 0xaa},
-       {0x00, 0x5c, 0x7d, 0xaa},       {0x00, 0x5d, 0x5f, 0xaa},
-       {0x00, 0x5e, 0x19, 0xaa},       {0x00, 0x6c, 0x0a, 0xaa},
-       {0x00, 0x6d, 0x55, 0xaa},       {0x00, 0x6e, 0x11, 0xaa},
-       {0x00, 0x6f, 0x9e, 0xaa},       {0x00, 0x69, 0x00, 0xaa},
-       {0x00, 0x6a, 0x40, 0xaa},       {0x00, 0x01, 0x40, 0xaa},
-       {0x00, 0x02, 0x40, 0xaa},       {0x00, 0x13, 0xe7, 0xaa},
-       {0x00, 0x5f, 0xf0, 0xaa},       {0x00, 0x60, 0xf0, 0xaa},
-       {0x00, 0x61, 0xf0, 0xaa},       {0x00, 0x27, 0xa0, 0xaa},
-       {0x00, 0x28, 0x80, 0xaa},       {0x00, 0x2c, 0x90, 0xaa},
-       {0x00, 0x4f, 0x66, 0xaa},       {0x00, 0x50, 0x66, 0xaa},
-       {0x00, 0x51, 0x00, 0xaa},       {0x00, 0x52, 0x22, 0xaa},
-       {0x00, 0x53, 0x5e, 0xaa},       {0x00, 0x54, 0x80, 0xaa},
-       {0x00, 0x58, 0x9e, 0xaa},       {0x00, 0x41, 0x08, 0xaa},
-       {0x00, 0x3f, 0x00, 0xaa},       {0x00, 0x75, 0x85, 0xaa},
-       {0x00, 0x76, 0xe1, 0xaa},       {0x00, 0x4c, 0x00, 0xaa},
-       {0x00, 0x77, 0x0a, 0xaa},       {0x00, 0x3d, 0x88, 0xaa},
-       {0x00, 0x4b, 0x09, 0xaa},       {0x00, 0xc9, 0x60, 0xaa},
-       {0x00, 0x41, 0x38, 0xaa},       {0x00, 0x62, 0x30, 0xaa},
-       {0x00, 0x63, 0x30, 0xaa},       {0x00, 0x64, 0x08, 0xaa},
-       {0x00, 0x94, 0x07, 0xaa},       {0x00, 0x95, 0x0b, 0xaa},
-       {0x00, 0x65, 0x00, 0xaa},       {0x00, 0x66, 0x05, 0xaa},
-       {0x00, 0x56, 0x50, 0xaa},       {0x00, 0x34, 0x11, 0xaa},
-       {0x00, 0xa4, 0x88, 0xaa},       {0x00, 0x96, 0x00, 0xaa},
-       {0x00, 0x97, 0x30, 0xaa},       {0x00, 0x98, 0x20, 0xaa},
-       {0x00, 0x99, 0x30, 0xaa},       {0x00, 0x9a, 0x84, 0xaa},
-       {0x00, 0x9b, 0x29, 0xaa},       {0x00, 0x9c, 0x03, 0xaa},
-       {0x00, 0x78, 0x04, 0xaa},       {0x00, 0x79, 0x01, 0xaa},
-       {0x00, 0xc8, 0xf0, 0xaa},       {0x00, 0x79, 0x0f, 0xaa},
-       {0x00, 0xc8, 0x00, 0xaa},       {0x00, 0x79, 0x10, 0xaa},
-       {0x00, 0xc8, 0x7e, 0xaa},       {0x00, 0x79, 0x0a, 0xaa},
-       {0x00, 0xc8, 0x80, 0xaa},       {0x00, 0x79, 0x0b, 0xaa},
-       {0x00, 0xc8, 0x01, 0xaa},       {0x00, 0x79, 0x0c, 0xaa},
-       {0x00, 0xc8, 0x0f, 0xaa},       {0x00, 0x79, 0x0d, 0xaa},
-       {0x00, 0xc8, 0x20, 0xaa},       {0x00, 0x79, 0x09, 0xaa},
-       {0x00, 0xc8, 0x80, 0xaa},       {0x00, 0x79, 0x02, 0xaa},
-       {0x00, 0xc8, 0xc0, 0xaa},       {0x00, 0x79, 0x03, 0xaa},
-       {0x00, 0xc8, 0x40, 0xaa},       {0x00, 0x79, 0x05, 0xaa},
-       {0x00, 0xc8, 0x30, 0xaa},       {0x00, 0x79, 0x26, 0xaa},
-       {0x00, 0x11, 0x40, 0xaa},       {0x00, 0x3a, 0x04, 0xaa},
-       {0x00, 0x12, 0x00, 0xaa},       {0x00, 0x40, 0xc0, 0xaa},
-       {0x00, 0x8c, 0x00, 0xaa},       {0x00, 0x17, 0x14, 0xaa},
-       {0x00, 0x18, 0x02, 0xaa},       {0x00, 0x32, 0x92, 0xaa},
-       {0x00, 0x19, 0x02, 0xaa},       {0x00, 0x1a, 0x7a, 0xaa},
-       {0x00, 0x03, 0x0a, 0xaa},       {0x00, 0x0c, 0x00, 0xaa},
-       {0x00, 0x3e, 0x00, 0xaa},       {0x00, 0x70, 0x3a, 0xaa},
-       {0x00, 0x71, 0x35, 0xaa},       {0x00, 0x72, 0x11, 0xaa},
-       {0x00, 0x73, 0xf0, 0xaa},       {0x00, 0xa2, 0x02, 0xaa},
-       {0x00, 0xb1, 0x00, 0xaa},       {0x00, 0xb1, 0x0c, 0xaa},
+       {0x00, 0x22, 0x91, 0xaa},
+       {0x00, 0x29, 0x07, 0xaa},
+       {0x00, 0x33, 0x0b, 0xaa},
+       {0x00, 0x35, 0x0b, 0xaa},
+       {0x00, 0x37, 0x1d, 0xaa},
+       {0x00, 0x38, 0x71, 0xaa},
+       {0x00, 0x39, 0x2a, 0xaa},
+       {0x00, 0x3c, 0x78, 0xaa},
+       {0x00, 0x4d, 0x40, 0xaa},
+       {0x00, 0x4e, 0x20, 0xaa},
+       {0x00, 0x74, 0x19, 0xaa},
+       {0x00, 0x8d, 0x4f, 0xaa},
+       {0x00, 0x8e, 0x00, 0xaa},
+       {0x00, 0x8f, 0x00, 0xaa},
+       {0x00, 0x90, 0x00, 0xaa},
+       {0x00, 0x91, 0x00, 0xaa},
+       {0x00, 0x96, 0x00, 0xaa},
+       {0x00, 0x9a, 0x80, 0xaa},
+       {0x00, 0xb0, 0x84, 0xaa},
+       {0x00, 0xb1, 0x0c, 0xaa},
+       {0x00, 0xb2, 0x0e, 0xaa},
+       {0x00, 0xb3, 0x82, 0xaa},
+       {0x00, 0xb8, 0x0a, 0xaa},
+       {0x00, 0x43, 0x14, 0xaa},
+       {0x00, 0x44, 0xf0, 0xaa},
+       {0x00, 0x45, 0x45, 0xaa},
+       {0x00, 0x46, 0x63, 0xaa},
+       {0x00, 0x47, 0x2d, 0xaa},
+       {0x00, 0x48, 0x46, 0xaa},
+       {0x00, 0x59, 0x88, 0xaa},
+       {0x00, 0x5a, 0xa0, 0xaa},
+       {0x00, 0x5b, 0xc6, 0xaa},
+       {0x00, 0x5c, 0x7d, 0xaa},
+       {0x00, 0x5d, 0x5f, 0xaa},
+       {0x00, 0x5e, 0x19, 0xaa},
+       {0x00, 0x6c, 0x0a, 0xaa},
+       {0x00, 0x6d, 0x55, 0xaa},
+       {0x00, 0x6e, 0x11, 0xaa},
+       {0x00, 0x6f, 0x9e, 0xaa},
+       {0x00, 0x69, 0x00, 0xaa},
+       {0x00, 0x6a, 0x40, 0xaa},
+       {0x00, 0x01, 0x40, 0xaa},
+       {0x00, 0x02, 0x40, 0xaa},
+       {0x00, 0x13, 0xe7, 0xaa},
+       {0x00, 0x5f, 0xf0, 0xaa},
+       {0x00, 0x60, 0xf0, 0xaa},
+       {0x00, 0x61, 0xf0, 0xaa},
+       {0x00, 0x27, 0xa0, 0xaa},
+       {0x00, 0x28, 0x80, 0xaa},
+       {0x00, 0x2c, 0x90, 0xaa},
+       {0x00, 0x4f, 0x66, 0xaa},
+       {0x00, 0x50, 0x66, 0xaa},
+       {0x00, 0x51, 0x00, 0xaa},
+       {0x00, 0x52, 0x22, 0xaa},
+       {0x00, 0x53, 0x5e, 0xaa},
+       {0x00, 0x54, 0x80, 0xaa},
+       {0x00, 0x58, 0x9e, 0xaa},
+       {0x00, 0x41, 0x08, 0xaa},
+       {0x00, 0x3f, 0x00, 0xaa},
+       {0x00, 0x75, 0x85, 0xaa},
+       {0x00, 0x76, 0xe1, 0xaa},
+       {0x00, 0x4c, 0x00, 0xaa},
+       {0x00, 0x77, 0x0a, 0xaa},
+       {0x00, 0x3d, 0x88, 0xaa},
+       {0x00, 0x4b, 0x09, 0xaa},
+       {0x00, 0xc9, 0x60, 0xaa},
+       {0x00, 0x41, 0x38, 0xaa},
+       {0x00, 0x62, 0x30, 0xaa},
+       {0x00, 0x63, 0x30, 0xaa},
+       {0x00, 0x64, 0x08, 0xaa},
+       {0x00, 0x94, 0x07, 0xaa},
+       {0x00, 0x95, 0x0b, 0xaa},
+       {0x00, 0x65, 0x00, 0xaa},
+       {0x00, 0x66, 0x05, 0xaa},
+       {0x00, 0x56, 0x50, 0xaa},
+       {0x00, 0x34, 0x11, 0xaa},
+       {0x00, 0xa4, 0x88, 0xaa},
+       {0x00, 0x96, 0x00, 0xaa},
+       {0x00, 0x97, 0x30, 0xaa},
+       {0x00, 0x98, 0x20, 0xaa},
+       {0x00, 0x99, 0x30, 0xaa},
+       {0x00, 0x9a, 0x84, 0xaa},
+       {0x00, 0x9b, 0x29, 0xaa},
+       {0x00, 0x9c, 0x03, 0xaa},
+       {0x00, 0x78, 0x04, 0xaa},
+       {0x00, 0x79, 0x01, 0xaa},
+       {0x00, 0xc8, 0xf0, 0xaa},
+       {0x00, 0x79, 0x0f, 0xaa},
+       {0x00, 0xc8, 0x00, 0xaa},
+       {0x00, 0x79, 0x10, 0xaa},
+       {0x00, 0xc8, 0x7e, 0xaa},
+       {0x00, 0x79, 0x0a, 0xaa},
+       {0x00, 0xc8, 0x80, 0xaa},
+       {0x00, 0x79, 0x0b, 0xaa},
+       {0x00, 0xc8, 0x01, 0xaa},
+       {0x00, 0x79, 0x0c, 0xaa},
+       {0x00, 0xc8, 0x0f, 0xaa},
+       {0x00, 0x79, 0x0d, 0xaa},
+       {0x00, 0xc8, 0x20, 0xaa},
+       {0x00, 0x79, 0x09, 0xaa},
+       {0x00, 0xc8, 0x80, 0xaa},
+       {0x00, 0x79, 0x02, 0xaa},
+       {0x00, 0xc8, 0xc0, 0xaa},
+       {0x00, 0x79, 0x03, 0xaa},
+       {0x00, 0xc8, 0x40, 0xaa},
+       {0x00, 0x79, 0x05, 0xaa},
+       {0x00, 0xc8, 0x30, 0xaa},
+       {0x00, 0x79, 0x26, 0xaa},
+       {0x00, 0x11, 0x40, 0xaa},
+       {0x00, 0x3a, 0x04, 0xaa},
+       {0x00, 0x12, 0x00, 0xaa},
+       {0x00, 0x40, 0xc0, 0xaa},
+       {0x00, 0x8c, 0x00, 0xaa},
+       {0x00, 0x17, 0x14, 0xaa},
+       {0x00, 0x18, 0x02, 0xaa},
+       {0x00, 0x32, 0x92, 0xaa},
+       {0x00, 0x19, 0x02, 0xaa},
+       {0x00, 0x1a, 0x7a, 0xaa},
+       {0x00, 0x03, 0x0a, 0xaa},
+       {0x00, 0x0c, 0x00, 0xaa},
+       {0x00, 0x3e, 0x00, 0xaa},
+       {0x00, 0x70, 0x3a, 0xaa},
+       {0x00, 0x71, 0x35, 0xaa},
+       {0x00, 0x72, 0x11, 0xaa},
+       {0x00, 0x73, 0xf0, 0xaa},
+       {0x00, 0xa2, 0x02, 0xaa},
+       {0x00, 0xb1, 0x00, 0xaa},
+       {0x00, 0xb1, 0x0c, 0xaa},
        {0x00, 0x1e, 0x37, 0xaa},       /* MVFP */
        {0x00, 0xaa, 0x14, 0xaa},
-       {0x00, 0x24, 0x80, 0xaa},       {0x00, 0x25, 0x74, 0xaa},
-       {0x00, 0x26, 0xd3, 0xaa},       {0x00, 0x0d, 0x00, 0xaa},
-       {0x00, 0x14, 0x18, 0xaa},       {0x00, 0x9d, 0x99, 0xaa},
-       {0x00, 0x9e, 0x7f, 0xaa},       {0x00, 0x64, 0x08, 0xaa},
-       {0x00, 0x94, 0x07, 0xaa},       {0x00, 0x95, 0x06, 0xaa},
-       {0x00, 0x66, 0x05, 0xaa},       {0x00, 0x41, 0x08, 0xaa},
-       {0x00, 0x3f, 0x00, 0xaa},       {0x00, 0x75, 0x07, 0xaa},
-       {0x00, 0x76, 0xe1, 0xaa},       {0x00, 0x4c, 0x00, 0xaa},
-       {0x00, 0x77, 0x00, 0xaa},       {0x00, 0x3d, 0xc2, 0xaa},
-       {0x00, 0x4b, 0x09, 0xaa},       {0x00, 0xc9, 0x60, 0xaa},
-       {0x00, 0x41, 0x38, 0xaa},       {0xb6, 0x00, 0x00, 0xcc},
-       {0xb6, 0x03, 0x01, 0xcc},       {0xb6, 0x02, 0x40, 0xcc},
-       {0xb6, 0x05, 0x00, 0xcc},       {0xb6, 0x04, 0xf0, 0xcc},
-       {0xb6, 0x12, 0xf8, 0xcc},       {0xb6, 0x13, 0x21, 0xcc},
-       {0xb6, 0x18, 0x00, 0xcc},       {0xb6, 0x17, 0x96, 0xcc},
-       {0xb6, 0x16, 0x00, 0xcc},       {0xb6, 0x22, 0x12, 0xcc},
-       {0xb6, 0x23, 0x0b, 0xcc},       {0xbf, 0xc0, 0x39, 0xcc},
-       {0xbf, 0xc1, 0x04, 0xcc},       {0xbf, 0xcc, 0x00, 0xcc},
-       {0xbc, 0x02, 0x18, 0xcc},       {0xbc, 0x03, 0x50, 0xcc},
-       {0xbc, 0x04, 0x18, 0xcc},       {0xbc, 0x05, 0x00, 0xcc},
-       {0xbc, 0x06, 0x00, 0xcc},       {0xbc, 0x08, 0x30, 0xcc},
-       {0xbc, 0x09, 0x40, 0xcc},       {0xbc, 0x0a, 0x10, 0xcc},
-       {0xbc, 0x0b, 0x00, 0xcc},       {0xbc, 0x0c, 0x00, 0xcc},
-       {0xb3, 0x5c, 0x01, 0xcc},       {0xb3, 0x01, 0x45, 0xcc},
-       {0x00, 0x77, 0x05, 0xaa },
+       {0x00, 0x24, 0x80, 0xaa},
+       {0x00, 0x25, 0x74, 0xaa},
+       {0x00, 0x26, 0xd3, 0xaa},
+       {0x00, 0x0d, 0x00, 0xaa},
+       {0x00, 0x14, 0x18, 0xaa},
+       {0x00, 0x9d, 0x99, 0xaa},
+       {0x00, 0x9e, 0x7f, 0xaa},
+       {0x00, 0x64, 0x08, 0xaa},
+       {0x00, 0x94, 0x07, 0xaa},
+       {0x00, 0x95, 0x06, 0xaa},
+       {0x00, 0x66, 0x05, 0xaa},
+       {0x00, 0x41, 0x08, 0xaa},
+       {0x00, 0x3f, 0x00, 0xaa},
+       {0x00, 0x75, 0x07, 0xaa},
+       {0x00, 0x76, 0xe1, 0xaa},
+       {0x00, 0x4c, 0x00, 0xaa},
+       {0x00, 0x77, 0x00, 0xaa},
+       {0x00, 0x3d, 0xc2, 0xaa},
+       {0x00, 0x4b, 0x09, 0xaa},
+       {0x00, 0xc9, 0x60, 0xaa},
+       {0x00, 0x41, 0x38, 0xaa},
+       {0xbc, 0x02, 0x18, 0xcc},
+       {0xbc, 0x03, 0x50, 0xcc},
+       {0xbc, 0x04, 0x18, 0xcc},
+       {0xbc, 0x05, 0x00, 0xcc},
+       {0xbc, 0x06, 0x00, 0xcc},
+       {0xbc, 0x08, 0x30, 0xcc},
+       {0xbc, 0x09, 0x40, 0xcc},
+       {0xbc, 0x0a, 0x10, 0xcc},
+       {0xbc, 0x0b, 0x00, 0xcc},
+       {0xbc, 0x0c, 0x00, 0xcc},
+       {0xbf, 0xc0, 0x26, 0xcc},
+       {0xbf, 0xc1, 0x02, 0xcc},
+       {0xbf, 0xcc, 0x04, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {0xb3, 0x01, 0x45, 0xcc},
+       {0x00, 0x77, 0x05, 0xaa},
        {},
 };
 
@@ -3117,6 +3338,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
                        cam->cam_mode = bi_mode;
                        cam->nmodes = ARRAY_SIZE(bi_mode);
                        break;
+               case SENSOR_OV7670:
+                       cam->cam_mode = bi_mode;
+                       cam->nmodes = ARRAY_SIZE(bi_mode) - 1;
+                       break;
                default:
                        cam->cam_mode = vc0323_mode;
                        cam->nmodes = ARRAY_SIZE(vc0323_mode) - 1;
@@ -3329,14 +3554,6 @@ static int sd_start(struct gspca_dev *gspca_dev)
                else
                        init = ov7660_initVGA_data;     /* 640x480 */
                break;
-       case SENSOR_OV7670:
-               /*GammaT = ov7660_gamma; */
-               /*MatrixT = ov7660_matrix; */
-               if (mode)
-                       init = ov7670_initQVGA_JPG;     /* 320x240 */
-               else
-                       init = ov7670_initVGA_JPG;      /* 640x480 */
-               break;
        case SENSOR_MI0360:
                GammaT = mi1320_gamma;
                MatrixT = mi0360_matrix;
@@ -3373,6 +3590,9 @@ static int sd_start(struct gspca_dev *gspca_dev)
                MatrixT = mi1320_matrix;
                init = mi1320_soc_init[mode];
                break;
+       case SENSOR_OV7670:
+               init = mode == 1 ? ov7670_InitVGA : ov7670_InitQVGA;
+               break;
        case SENSOR_PO3130NC:
                GammaT = po3130_gamma;
                MatrixT = po3130_matrix;
@@ -3426,7 +3646,13 @@ static int sd_start(struct gspca_dev *gspca_dev)
                sethvflip(gspca_dev);
                setlightfreq(gspca_dev);
        }
-       if (sd->sensor == SENSOR_POxxxx) {
+       switch (sd->sensor) {
+       case SENSOR_OV7670:
+               reg_w(gspca_dev->dev, 0x87, 0xffff, 0xffff);
+               reg_w(gspca_dev->dev, 0x88, 0xff00, 0xf0f1);
+               reg_w(gspca_dev->dev, 0xa0, 0x0000, 0xbfff);
+               break;
+       case SENSOR_POxxxx:
                setcolors(gspca_dev);
                setbrightness(gspca_dev);
                setcontrast(gspca_dev);
@@ -3435,6 +3661,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
                msleep(80);
                reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
                usb_exchange(gspca_dev, poxxxx_init_end_2);
+               break;
        }
        return 0;
 }