Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git] / drivers / media / video / gspca / vc032x.c
index 0525ea5..e4e933c 100644 (file)
@@ -37,18 +37,21 @@ struct sd {
        __u8 lightfreq;
        __u8 sharpness;
 
+       u8 image_offset;
+
        char bridge;
 #define BRIDGE_VC0321 0
 #define BRIDGE_VC0323 1
        char sensor;
 #define SENSOR_HV7131R 0
 #define SENSOR_MI0360 1
-#define SENSOR_MI1320 2
-#define SENSOR_MI1310_SOC 3
-#define SENSOR_OV7660 4
-#define SENSOR_OV7670 5
-#define SENSOR_PO1200 6
-#define SENSOR_PO3130NC 7
+#define SENSOR_MI1310_SOC 2
+#define SENSOR_MI1320 3
+#define SENSOR_MI1320_SOC 4
+#define SENSOR_OV7660 5
+#define SENSOR_OV7670 6
+#define SENSOR_PO1200 7
+#define SENSOR_PO3130NC 8
 };
 
 /* V4L2 controls supported by the driver */
@@ -149,8 +152,29 @@ static const struct v4l2_pix_format vc0323_mode[] = {
                .sizeimage = 640 * 480 * 3 / 8 + 590,
                .colorspace = V4L2_COLORSPACE_JPEG,
                .priv = 0},
+       {1280, 1024, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, /* mi13x0_soc only */
+               .bytesperline = 1280,
+               .sizeimage = 1280 * 1024 * 1 / 4 + 590,
+               .colorspace = V4L2_COLORSPACE_JPEG,
+               .priv = 2},
+};
+static const struct v4l2_pix_format bi_mode[] = {
+       {320, 240, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
+               .bytesperline = 320,
+               .sizeimage = 320 * 240 * 2,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 2},
+       {640, 480, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
+               .bytesperline = 640,
+               .sizeimage = 640 * 480 * 2,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 1},
+       {1280, 1024, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
+               .bytesperline = 1280,
+               .sizeimage = 1280 * 1024 * 2,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 0},
 };
-
 static const struct v4l2_pix_format svga_mode[] = {
        {800, 600, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                .bytesperline = 800,
@@ -400,92 +424,208 @@ static const __u8 mi0360_initQVGA_JPG[][4] = {
 static const __u8 mi1310_socinitVGA_JPG[][4] = {
        {0xb0, 0x03, 0x19, 0xcc},
        {0xb0, 0x04, 0x02, 0xcc},
-       {0xb3, 0x00, 0x64, 0xcc},
-       {0xb3, 0x00, 0x65, 0xcc},
-       {0xb3, 0x05, 0x00, 0xcc},
-       {0xb3, 0x06, 0x00, 0xcc},
+       {0xb3, 0x00, 0x24, 0xcc},
+       {0xb3, 0x00, 0x25, 0xcc},
+       {0xb3, 0x05, 0x01, 0xcc},
+       {0xb3, 0x06, 0x03, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},
        {0xb3, 0x08, 0x01, 0xcc},
        {0xb3, 0x09, 0x0c, 0xcc},
        {0xb3, 0x34, 0x02, 0xcc},
        {0xb3, 0x35, 0xdd, 0xcc},
-       {0xb3, 0x02, 0x00, 0xcc},
        {0xb3, 0x03, 0x0a, 0xcc},
-       {0xb3, 0x04, 0x05, 0xcc},
+       {0xb3, 0x04, 0x0d, 0xcc},
        {0xb3, 0x20, 0x00, 0xcc},
        {0xb3, 0x21, 0x00, 0xcc},
-       {0xb3, 0x22, 0x03, 0xcc},
-       {0xb3, 0x23, 0xc0, 0xcc},
+       {0xb3, 0x22, 0x01, 0xcc},
+       {0xb3, 0x23, 0xe0, 0xcc},
        {0xb3, 0x14, 0x00, 0xcc},
        {0xb3, 0x15, 0x00, 0xcc},
-       {0xb3, 0x16, 0x04, 0xcc},
-       {0xb3, 0x17, 0xff, 0xcc},
-       {0xb3, 0x00, 0x65, 0xcc},
-       {0xb8, 0x00, 0x00, 0xcc},
-       {0xbc, 0x00, 0xd0, 0xcc},
-       {0xbc, 0x01, 0x01, 0xcc},
-       {0xf0, 0x00, 0x02, 0xbb},
-       {0xc8, 0x9f, 0x0b, 0xbb},
-       {0x5b, 0x00, 0x01, 0xbb},
-       {0x2f, 0xde, 0x20, 0xbb},
+       {0xb3, 0x16, 0x02, 0xcc},
+       {0xb3, 0x17, 0x7f, 0xcc},
+       {0xb8, 0x01, 0x7d, 0xcc},
+       {0xb8, 0x81, 0x09, 0xcc},
+       {0xb8, 0x27, 0x20, 0xcc},
+       {0xb8, 0x26, 0x80, 0xcc},
+       {0xb3, 0x00, 0x25, 0xcc},
+       {0xb8, 0x00, 0x13, 0xcc},
+       {0xbc, 0x00, 0x71, 0xcc},
+       {0xb8, 0x81, 0x01, 0xcc},
+       {0xb8, 0x2c, 0x5a, 0xcc},
+       {0xb8, 0x2d, 0xff, 0xcc},
+       {0xb8, 0x2e, 0xee, 0xcc},
+       {0xb8, 0x2f, 0xfb, 0xcc},
+       {0xb8, 0x30, 0x52, 0xcc},
+       {0xb8, 0x31, 0xf8, 0xcc},
+       {0xb8, 0x32, 0xf1, 0xcc},
+       {0xb8, 0x33, 0xff, 0xcc},
+       {0xb8, 0x34, 0x54, 0xcc},
+       {0xb8, 0x35, 0x00, 0xcc},
+       {0xb8, 0x36, 0x00, 0xcc},
+       {0xb8, 0x37, 0x00, 0xcc},
        {0xf0, 0x00, 0x00, 0xbb},
-       {0x20, 0x03, 0x02, 0xbb},
+       {0x00, 0x01, 0x00, 0xdd},
+       {0x0d, 0x00, 0x09, 0xbb},
+       {0x0d, 0x00, 0x08, 0xbb},
        {0xf0, 0x00, 0x01, 0xbb},
-       {0x05, 0x00, 0x07, 0xbb},
-       {0x34, 0x00, 0x00, 0xbb},
-       {0x35, 0xff, 0x00, 0xbb},
-       {0xdc, 0x07, 0x02, 0xbb},
-       {0xdd, 0x3c, 0x18, 0xbb},
-       {0xde, 0x92, 0x6d, 0xbb},
-       {0xdf, 0xcd, 0xb1, 0xbb},
-       {0xe0, 0xff, 0xe7, 0xbb},
-       {0x06, 0xf0, 0x0d, 0xbb},
-       {0x06, 0x70, 0x0e, 0xbb},
-       {0x4c, 0x00, 0x01, 0xbb},
-       {0x4d, 0x00, 0x01, 0xbb},
-       {0xf0, 0x00, 0x02, 0xbb},
-       {0x2e, 0x0c, 0x55, 0xbb},
-       {0x21, 0xb6, 0x6e, 0xbb},
-       {0x36, 0x30, 0x10, 0xbb},
-       {0x37, 0x00, 0xc1, 0xbb},
+       {0x00, 0x01, 0x00, 0xdd},
+       {0x06, 0x00, 0x14, 0xbb},
+       {0x3a, 0x10, 0x00, 0xbb},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0x9b, 0x10, 0x00, 0xbb},
+       {0x00, 0x00, 0x10, 0xdd},
        {0xf0, 0x00, 0x00, 0xbb},
-       {0x07, 0x00, 0x84, 0xbb},
-       {0x08, 0x02, 0x4a, 0xbb},
-       {0x05, 0x01, 0x10, 0xbb},
-       {0x06, 0x00, 0x39, 0xbb},
-       {0xf0, 0x00, 0x02, 0xbb},
-       {0x58, 0x02, 0x67, 0xbb},
-       {0x57, 0x02, 0x00, 0xbb},
-       {0x5a, 0x02, 0x67, 0xbb},
-       {0x59, 0x02, 0x00, 0xbb},
-       {0x5c, 0x12, 0x0d, 0xbb},
-       {0x5d, 0x16, 0x11, 0xbb},
-       {0x39, 0x06, 0x18, 0xbb},
-       {0x3a, 0x06, 0x18, 0xbb},
-       {0x3b, 0x06, 0x18, 0xbb},
-       {0x3c, 0x06, 0x18, 0xbb},
-       {0x64, 0x7b, 0x5b, 0xbb},
-       {0xf0, 0x00, 0x02, 0xbb},
-       {0x36, 0x30, 0x10, 0xbb},
-       {0x37, 0x00, 0xc0, 0xbb},
-       {0xbc, 0x0e, 0x00, 0xcc},
-       {0xbc, 0x0f, 0x05, 0xcc},
-       {0xbc, 0x10, 0xc0, 0xcc},
-       {0xbc, 0x11, 0x03, 0xcc},
+       {0x00, 0x01, 0x00, 0xdd},
+       {0x2b, 0x00, 0x28, 0xbb},
+       {0x2c, 0x00, 0x30, 0xbb},
+       {0x2d, 0x00, 0x30, 0xbb},
+       {0x2e, 0x00, 0x28, 0xbb},
+       {0x41, 0x00, 0xd7, 0xbb},
+       {0x09, 0x02, 0x3a, 0xbb},
+       {0x0c, 0x00, 0x00, 0xbb},
+       {0x20, 0x00, 0x00, 0xbb},
+       {0x05, 0x00, 0x8c, 0xbb},
+       {0x06, 0x00, 0x32, 0xbb},
+       {0x07, 0x00, 0xc6, 0xbb},
+       {0x08, 0x00, 0x19, 0xbb},
+       {0x24, 0x80, 0x6f, 0xbb},
+       {0xc8, 0x00, 0x0f, 0xbb},
+       {0x20, 0x00, 0x0f, 0xbb},
        {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, 0x25, 0xcc},
+       {0xb6, 0x12, 0x78, 0xcc},
        {0xb6, 0x18, 0x02, 0xcc},
        {0xb6, 0x17, 0x58, 0xcc},
        {0xb6, 0x16, 0x00, 0xcc},
        {0xb6, 0x22, 0x12, 0xcc},
        {0xb6, 0x23, 0x0b, 0xcc},
+       {0xb3, 0x02, 0x02, 0xcc},
        {0xbf, 0xc0, 0x39, 0xcc},
        {0xbf, 0xc1, 0x04, 0xcc},
-       {0xbf, 0xcc, 0x00, 0xcc},
+       {0xbf, 0xcc, 0x10, 0xcc},
+       {0xb9, 0x12, 0x00, 0xcc},
+       {0xb9, 0x13, 0x0a, 0xcc},
+       {0xb9, 0x14, 0x0a, 0xcc},
+       {0xb9, 0x15, 0x0a, 0xcc},
+       {0xb9, 0x16, 0x0a, 0xcc},
+       {0xb9, 0x18, 0x00, 0xcc},
+       {0xb9, 0x19, 0x0f, 0xcc},
+       {0xb9, 0x1a, 0x0f, 0xcc},
+       {0xb9, 0x1b, 0x0f, 0xcc},
+       {0xb9, 0x1c, 0x0f, 0xcc},
+       {0xb8, 0x8e, 0x00, 0xcc},
+       {0xb8, 0x8f, 0xff, 0xcc},
+       {0xb3, 0x01, 0x41, 0xcc},
+       {0x03, 0x03, 0xc0, 0xbb},
+       {0x06, 0x00, 0x10, 0xbb},
+       {0xb6, 0x12, 0xf8, 0xcc},
+       {0xb8, 0x0c, 0x20, 0xcc},
+       {0xb8, 0x0d, 0x70, 0xcc},
+       {0xb6, 0x13, 0x13, 0xcc},
+       {0x2f, 0x00, 0xC0, 0xbb},
+       {0xb8, 0xa0, 0x12, 0xcc},
+       {},
+};
+static const __u8 mi1310_socinitQVGA_JPG[][4] = {
+       {0xb0, 0x03, 0x19, 0xcc},
+       {0xb0, 0x04, 0x02, 0xcc},
+       {0xb3, 0x00, 0x24, 0xcc},
+       {0xb3, 0x00, 0x25, 0xcc},
+       {0xb3, 0x05, 0x01, 0xcc},
+       {0xb3, 0x06, 0x03, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {0xb3, 0x08, 0x01, 0xcc},
+       {0xb3, 0x09, 0x0c, 0xcc},
+       {0xb3, 0x34, 0x02, 0xcc},
+       {0xb3, 0x35, 0xdd, 0xcc},
+       {0xb3, 0x03, 0x0a, 0xcc},
+       {0xb3, 0x04, 0x0d, 0xcc},
+       {0xb3, 0x20, 0x00, 0xcc},
+       {0xb3, 0x21, 0x00, 0xcc},
+       {0xb3, 0x22, 0x01, 0xcc},
+       {0xb3, 0x23, 0xe0, 0xcc},
+       {0xb3, 0x14, 0x00, 0xcc},
+       {0xb3, 0x15, 0x00, 0xcc},
+       {0xb3, 0x16, 0x02, 0xcc},
+       {0xb3, 0x17, 0x7f, 0xcc},
+       {0xb8, 0x01, 0x7d, 0xcc},
+       {0xb8, 0x81, 0x09, 0xcc},
+       {0xb8, 0x27, 0x20, 0xcc},
+       {0xb8, 0x26, 0x80, 0xcc},
+       {0xb3, 0x00, 0x25, 0xcc},
+       {0xb8, 0x00, 0x13, 0xcc},
+       {0xbc, 0x00, 0xd1, 0xcc},
+       {0xb8, 0x81, 0x01, 0xcc},
+       {0xb8, 0x2c, 0x5a, 0xcc},
+       {0xb8, 0x2d, 0xff, 0xcc},
+       {0xb8, 0x2e, 0xee, 0xcc},
+       {0xb8, 0x2f, 0xfb, 0xcc},
+       {0xb8, 0x30, 0x52, 0xcc},
+       {0xb8, 0x31, 0xf8, 0xcc},
+       {0xb8, 0x32, 0xf1, 0xcc},
+       {0xb8, 0x33, 0xff, 0xcc},
+       {0xb8, 0x34, 0x54, 0xcc},
+       {0xb8, 0x35, 0x00, 0xcc},
+       {0xb8, 0x36, 0x00, 0xcc},
+       {0xb8, 0x37, 0x00, 0xcc},
+       {0xf0, 0x00, 0x00, 0xbb},
+       {0x00, 0x01, 0x00, 0xdd},
+       {0x0d, 0x00, 0x09, 0xbb},
+       {0x0d, 0x00, 0x08, 0xbb},
+       {0xf0, 0x00, 0x01, 0xbb},
+       {0x00, 0x01, 0x00, 0xdd},
+       {0x06, 0x00, 0x14, 0xbb},
+       {0x3a, 0x10, 0x00, 0xbb},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0x9b, 0x10, 0x00, 0xbb},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0xf0, 0x00, 0x00, 0xbb},
+       {0x00, 0x01, 0x00, 0xdd},
+       {0x2b, 0x00, 0x28, 0xbb},
+       {0x2c, 0x00, 0x30, 0xbb},
+       {0x2d, 0x00, 0x30, 0xbb},
+       {0x2e, 0x00, 0x28, 0xbb},
+       {0x41, 0x00, 0xd7, 0xbb},
+       {0x09, 0x02, 0x3a, 0xbb},
+       {0x0c, 0x00, 0x00, 0xbb},
+       {0x20, 0x00, 0x00, 0xbb},
+       {0x05, 0x00, 0x8c, 0xbb},
+       {0x06, 0x00, 0x32, 0xbb},
+       {0x07, 0x00, 0xc6, 0xbb},
+       {0x08, 0x00, 0x19, 0xbb},
+       {0x24, 0x80, 0x6f, 0xbb},
+       {0xc8, 0x00, 0x0f, 0xbb},
+       {0x20, 0x00, 0x0f, 0xbb},
+       {0xb6, 0x00, 0x00, 0xcc},
+       {0xb6, 0x03, 0x01, 0xcc},
+       {0xb6, 0x02, 0x40, 0xcc},
+       {0xb6, 0x05, 0x00, 0xcc},
+       {0xb6, 0x04, 0xf0, 0xcc},
+       {0xb6, 0x12, 0x78, 0xcc},
+       {0xb6, 0x18, 0x00, 0xcc},
+       {0xb6, 0x17, 0x96, 0xcc},
+       {0xb6, 0x16, 0x00, 0xcc},
+       {0xb6, 0x22, 0x12, 0xcc},
+       {0xb6, 0x23, 0x0b, 0xcc},
+       {0xb3, 0x02, 0x02, 0xcc},
+       {0xbf, 0xc0, 0x39, 0xcc},
+       {0xbf, 0xc1, 0x04, 0xcc},
+       {0xbf, 0xcc, 0x10, 0xcc},
+       {0xb9, 0x12, 0x00, 0xcc},
+       {0xb9, 0x13, 0x0a, 0xcc},
+       {0xb9, 0x14, 0x0a, 0xcc},
+       {0xb9, 0x15, 0x0a, 0xcc},
+       {0xb9, 0x16, 0x0a, 0xcc},
+       {0xb9, 0x18, 0x00, 0xcc},
+       {0xb9, 0x19, 0x0f, 0xcc},
+       {0xb9, 0x1a, 0x0f, 0xcc},
+       {0xb9, 0x1b, 0x0f, 0xcc},
+       {0xb9, 0x1c, 0x0f, 0xcc},
+       {0xb8, 0x8e, 0x00, 0xcc},
+       {0xb8, 0x8f, 0xff, 0xcc},
        {0xbc, 0x02, 0x18, 0xcc},
        {0xbc, 0x03, 0x50, 0xcc},
        {0xbc, 0x04, 0x18, 0xcc},
@@ -496,131 +636,123 @@ static const __u8 mi1310_socinitVGA_JPG[][4] = {
        {0xbc, 0x0a, 0x10, 0xcc},
        {0xbc, 0x0b, 0x00, 0xcc},
        {0xbc, 0x0c, 0x00, 0xcc},
-       {0xb3, 0x5c, 0x01, 0xcc},
-       {0xf0, 0x00, 0x01, 0xbb},
-       {0x80, 0x00, 0x03, 0xbb},
-       {0x81, 0xc7, 0x14, 0xbb},
-       {0x82, 0xeb, 0xe8, 0xbb},
-       {0x83, 0xfe, 0xf4, 0xbb},
-       {0x84, 0xcd, 0x10, 0xbb},
-       {0x85, 0xf3, 0xee, 0xbb},
-       {0x86, 0xff, 0xf1, 0xbb},
-       {0x87, 0xcd, 0x10, 0xbb},
-       {0x88, 0xf3, 0xee, 0xbb},
-       {0x89, 0x01, 0xf1, 0xbb},
-       {0x8a, 0xe5, 0x17, 0xbb},
-       {0x8b, 0xe8, 0xe2, 0xbb},
-       {0x8c, 0xf7, 0xed, 0xbb},
-       {0x8d, 0x00, 0xff, 0xbb},
-       {0x8e, 0xec, 0x10, 0xbb},
-       {0x8f, 0xf0, 0xed, 0xbb},
-       {0x90, 0xf9, 0xf2, 0xbb},
-       {0x91, 0x00, 0x00, 0xbb},
-       {0x92, 0xe9, 0x0d, 0xbb},
-       {0x93, 0xf4, 0xf2, 0xbb},
-       {0x94, 0xfb, 0xf5, 0xbb},
-       {0x95, 0x00, 0xff, 0xbb},
-       {0xb6, 0x0f, 0x08, 0xbb},
-       {0xb7, 0x3d, 0x16, 0xbb},
-       {0xb8, 0x0c, 0x04, 0xbb},
-       {0xb9, 0x1c, 0x07, 0xbb},
-       {0xba, 0x0a, 0x03, 0xbb},
-       {0xbb, 0x1b, 0x09, 0xbb},
-       {0xbc, 0x17, 0x0d, 0xbb},
-       {0xbd, 0x23, 0x1d, 0xbb},
-       {0xbe, 0x00, 0x28, 0xbb},
-       {0xbf, 0x11, 0x09, 0xbb},
-       {0xc0, 0x16, 0x15, 0xbb},
-       {0xc1, 0x00, 0x1b, 0xbb},
-       {0xc2, 0x0e, 0x07, 0xbb},
-       {0xc3, 0x14, 0x10, 0xbb},
-       {0xc4, 0x00, 0x17, 0xbb},
-       {0x06, 0x74, 0x8e, 0xbb},
-       {0xf0, 0x00, 0x01, 0xbb},
-       {0x06, 0xf4, 0x8e, 0xbb},
-       {0x00, 0x00, 0x50, 0xdd},
-       {0x06, 0x74, 0x8e, 0xbb},
-       {0xf0, 0x00, 0x02, 0xbb},
-       {0x24, 0x50, 0x20, 0xbb},
-       {0xf0, 0x00, 0x02, 0xbb},
-       {0x34, 0x0c, 0x50, 0xbb},
        {0xb3, 0x01, 0x41, 0xcc},
-       {0xf0, 0x00, 0x00, 0xbb},
        {0x03, 0x03, 0xc0, 0xbb},
+       {0x06, 0x00, 0x10, 0xbb},
+       {0xb6, 0x12, 0xf8, 0xcc},
+       {0xb8, 0x0c, 0x20, 0xcc},
+       {0xb8, 0x0d, 0x70, 0xcc},
+       {0xb6, 0x13, 0x13, 0xcc},
+       {0x2f, 0x00, 0xC0, 0xbb},
+       {0xb8, 0xa0, 0x12, 0xcc},
        {},
 };
-static const __u8 mi1310_socinitQVGA_JPG[][4] = {
-       {0xb0, 0x03, 0x19, 0xcc},       {0xb0, 0x04, 0x02, 0xcc},
-       {0xb3, 0x00, 0x64, 0xcc},       {0xb3, 0x00, 0x65, 0xcc},
-       {0xb3, 0x05, 0x00, 0xcc},       {0xb3, 0x06, 0x00, 0xcc},
-       {0xb3, 0x08, 0x01, 0xcc},       {0xb3, 0x09, 0x0c, 0xcc},
-       {0xb3, 0x34, 0x02, 0xcc},       {0xb3, 0x35, 0xdd, 0xcc},
-       {0xb3, 0x02, 0x00, 0xcc},       {0xb3, 0x03, 0x0a, 0xcc},
-       {0xb3, 0x04, 0x05, 0xcc},       {0xb3, 0x20, 0x00, 0xcc},
-       {0xb3, 0x21, 0x00, 0xcc},       {0xb3, 0x22, 0x03, 0xcc},
-       {0xb3, 0x23, 0xc0, 0xcc},       {0xb3, 0x14, 0x00, 0xcc},
-       {0xb3, 0x15, 0x00, 0xcc},       {0xb3, 0x16, 0x04, 0xcc},
-       {0xb3, 0x17, 0xff, 0xcc},       {0xb3, 0x00, 0x65, 0xcc},
-       {0xb8, 0x00, 0x00, 0xcc},       {0xbc, 0x00, 0xf0, 0xcc},
-       {0xbc, 0x01, 0x01, 0xcc},       {0xf0, 0x00, 0x02, 0xbb},
-       {0xc8, 0x9f, 0x0b, 0xbb},       {0x5b, 0x00, 0x01, 0xbb},
-       {0x2f, 0xde, 0x20, 0xbb},       {0xf0, 0x00, 0x00, 0xbb},
-       {0x20, 0x03, 0x02, 0xbb},       {0xf0, 0x00, 0x01, 0xbb},
-       {0x05, 0x00, 0x07, 0xbb},       {0x34, 0x00, 0x00, 0xbb},
-       {0x35, 0xff, 0x00, 0xbb},       {0xdc, 0x07, 0x02, 0xbb},
-       {0xdd, 0x3c, 0x18, 0xbb},       {0xde, 0x92, 0x6d, 0xbb},
-       {0xdf, 0xcd, 0xb1, 0xbb},       {0xe0, 0xff, 0xe7, 0xbb},
-       {0x06, 0xf0, 0x0d, 0xbb},       {0x06, 0x70, 0x0e, 0xbb},
-       {0x4c, 0x00, 0x01, 0xbb},       {0x4d, 0x00, 0x01, 0xbb},
-       {0xf0, 0x00, 0x02, 0xbb},       {0x2e, 0x0c, 0x55, 0xbb},
-       {0x21, 0xb6, 0x6e, 0xbb},       {0x36, 0x30, 0x10, 0xbb},
-       {0x37, 0x00, 0xc1, 0xbb},       {0xf0, 0x00, 0x00, 0xbb},
-       {0x07, 0x00, 0x84, 0xbb},       {0x08, 0x02, 0x4a, 0xbb},
-       {0x05, 0x01, 0x10, 0xbb},       {0x06, 0x00, 0x39, 0xbb},
-       {0xf0, 0x00, 0x02, 0xbb},       {0x58, 0x02, 0x67, 0xbb},
-       {0x57, 0x02, 0x00, 0xbb},       {0x5a, 0x02, 0x67, 0xbb},
-       {0x59, 0x02, 0x00, 0xbb},       {0x5c, 0x12, 0x0d, 0xbb},
-       {0x5d, 0x16, 0x11, 0xbb},       {0x39, 0x06, 0x18, 0xbb},
-       {0x3a, 0x06, 0x18, 0xbb},       {0x3b, 0x06, 0x18, 0xbb},
-       {0x3c, 0x06, 0x18, 0xbb},       {0x64, 0x7b, 0x5b, 0xbb},
-       {0xf0, 0x00, 0x02, 0xbb},       {0x36, 0x30, 0x10, 0xbb},
-       {0x37, 0x00, 0xc0, 0xbb},       {0xbc, 0x0e, 0x00, 0xcc},
-       {0xbc, 0x0f, 0x05, 0xcc},       {0xbc, 0x10, 0xc0, 0xcc},
-       {0xbc, 0x11, 0x03, 0xcc},       {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, 0x25, 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},
-       {0xb3, 0x5c, 0x01, 0xcc},       {0xf0, 0x00, 0x01, 0xbb},
-       {0x80, 0x00, 0x03, 0xbb},       {0x81, 0xc7, 0x14, 0xbb},
-       {0x82, 0xeb, 0xe8, 0xbb},       {0x83, 0xfe, 0xf4, 0xbb},
-       {0x84, 0xcd, 0x10, 0xbb},       {0x85, 0xf3, 0xee, 0xbb},
-       {0x86, 0xff, 0xf1, 0xbb},       {0x87, 0xcd, 0x10, 0xbb},
-       {0x88, 0xf3, 0xee, 0xbb},       {0x89, 0x01, 0xf1, 0xbb},
-       {0x8a, 0xe5, 0x17, 0xbb},       {0x8b, 0xe8, 0xe2, 0xbb},
-       {0x8c, 0xf7, 0xed, 0xbb},       {0x8d, 0x00, 0xff, 0xbb},
-       {0x8e, 0xec, 0x10, 0xbb},       {0x8f, 0xf0, 0xed, 0xbb},
-       {0x90, 0xf9, 0xf2, 0xbb},       {0x91, 0x00, 0x00, 0xbb},
-       {0x92, 0xe9, 0x0d, 0xbb},       {0x93, 0xf4, 0xf2, 0xbb},
-       {0x94, 0xfb, 0xf5, 0xbb},       {0x95, 0x00, 0xff, 0xbb},
-       {0xb6, 0x0f, 0x08, 0xbb},       {0xb7, 0x3d, 0x16, 0xbb},
-       {0xb8, 0x0c, 0x04, 0xbb},       {0xb9, 0x1c, 0x07, 0xbb},
-       {0xba, 0x0a, 0x03, 0xbb},       {0xbb, 0x1b, 0x09, 0xbb},
-       {0xbc, 0x17, 0x0d, 0xbb},       {0xbd, 0x23, 0x1d, 0xbb},
-       {0xbe, 0x00, 0x28, 0xbb},       {0xbf, 0x11, 0x09, 0xbb},
-       {0xc0, 0x16, 0x15, 0xbb},       {0xc1, 0x00, 0x1b, 0xbb},
-       {0xc2, 0x0e, 0x07, 0xbb},       {0xc3, 0x14, 0x10, 0xbb},
-       {0xc4, 0x00, 0x17, 0xbb},       {0x06, 0x74, 0x8e, 0xbb},
-       {0xf0, 0x00, 0x01, 0xbb},       {0x06, 0xf4, 0x8e, 0xbb},
-       {0x00, 0x00, 0x50, 0xdd},       {0x06, 0x74, 0x8e, 0xbb},
-       {0xf0, 0x00, 0x02, 0xbb},       {0x24, 0x50, 0x20, 0xbb},
-       {0xf0, 0x00, 0x02, 0xbb},       {0x34, 0x0c, 0x50, 0xbb},
-       {0xb3, 0x01, 0x41, 0xcc},       {0xf0, 0x00, 0x00, 0xbb},
-       {0x03, 0x03, 0xc0, 0xbb},
-       {},
+static const u8 mi1310_soc_InitSXGA_JPG[][4] = {
+       {0xb0, 0x03, 0x19, 0xcc},
+       {0xb0, 0x04, 0x02, 0xcc},
+       {0xb3, 0x00, 0x24, 0xcc},
+       {0xb3, 0x00, 0x25, 0xcc},
+       {0xb3, 0x05, 0x00, 0xcc},
+       {0xb3, 0x06, 0x01, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {0xb3, 0x08, 0x01, 0xcc},
+       {0xb3, 0x09, 0x0c, 0xcc},
+       {0xb3, 0x34, 0x02, 0xcc},
+       {0xb3, 0x35, 0xdd, 0xcc},
+       {0xb3, 0x03, 0x0a, 0xcc},
+       {0xb3, 0x04, 0x0d, 0xcc},
+       {0xb3, 0x20, 0x00, 0xcc},
+       {0xb3, 0x21, 0x00, 0xcc},
+       {0xb3, 0x22, 0x04, 0xcc},
+       {0xb3, 0x23, 0x00, 0xcc},
+       {0xb3, 0x14, 0x00, 0xcc},
+       {0xb3, 0x15, 0x00, 0xcc},
+       {0xb3, 0x16, 0x04, 0xcc},
+       {0xb3, 0x17, 0xff, 0xcc},
+       {0xb8, 0x01, 0x7d, 0xcc},
+       {0xb8, 0x81, 0x09, 0xcc},
+       {0xb8, 0x27, 0x20, 0xcc},
+       {0xb8, 0x26, 0x80, 0xcc},
+       {0xb8, 0x06, 0x00, 0xcc},
+       {0xb8, 0x07, 0x05, 0xcc},
+       {0xb8, 0x08, 0x00, 0xcc},
+       {0xb8, 0x09, 0x04, 0xcc},
+       {0xb3, 0x00, 0x25, 0xcc},
+       {0xb8, 0x00, 0x11, 0xcc},
+       {0xbc, 0x00, 0x71, 0xcc},
+       {0xb8, 0x81, 0x01, 0xcc},
+       {0xb8, 0x2c, 0x5a, 0xcc},
+       {0xb8, 0x2d, 0xff, 0xcc},
+       {0xb8, 0x2e, 0xee, 0xcc},
+       {0xb8, 0x2f, 0xfb, 0xcc},
+       {0xb8, 0x30, 0x52, 0xcc},
+       {0xb8, 0x31, 0xf8, 0xcc},
+       {0xb8, 0x32, 0xf1, 0xcc},
+       {0xb8, 0x33, 0xff, 0xcc},
+       {0xb8, 0x34, 0x54, 0xcc},
+       {0xf0, 0x00, 0x00, 0xbb},
+       {0x00, 0x01, 0x00, 0xdd},
+       {0x0d, 0x00, 0x09, 0xbb},
+       {0x0d, 0x00, 0x08, 0xbb},
+       {0xf0, 0x00, 0x01, 0xbb},
+       {0x00, 0x01, 0x00, 0xdd},
+       {0x06, 0x00, 0x14, 0xbb},
+       {0x3a, 0x10, 0x00, 0xbb},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0x9b, 0x10, 0x00, 0xbb},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0xf0, 0x00, 0x00, 0xbb},
+       {0x00, 0x01, 0x00, 0xdd},
+       {0x2b, 0x00, 0x28, 0xbb},
+       {0x2c, 0x00, 0x30, 0xbb},
+       {0x2d, 0x00, 0x30, 0xbb},
+       {0x2e, 0x00, 0x28, 0xbb},
+       {0x41, 0x00, 0xd7, 0xbb},
+       {0x09, 0x02, 0x3a, 0xbb},
+       {0x0c, 0x00, 0x00, 0xbb},
+       {0x20, 0x00, 0x00, 0xbb},
+       {0x05, 0x00, 0x8c, 0xbb},
+       {0x06, 0x00, 0x32, 0xbb},
+       {0x07, 0x00, 0xc6, 0xbb},
+       {0x08, 0x00, 0x19, 0xbb},
+       {0x24, 0x80, 0x6f, 0xbb},
+       {0xc8, 0x00, 0x0f, 0xbb},
+       {0x20, 0x00, 0x03, 0xbb},
+       {0xb6, 0x00, 0x00, 0xcc},
+       {0xb6, 0x03, 0x05, 0xcc},
+       {0xb6, 0x02, 0x00, 0xcc},
+       {0xb6, 0x05, 0x04, 0xcc},
+       {0xb6, 0x04, 0x00, 0xcc},
+       {0xb6, 0x12, 0xf8, 0xcc},
+       {0xb6, 0x18, 0x0a, 0xcc},
+       {0xb6, 0x17, 0x00, 0xcc},
+       {0xb6, 0x16, 0x00, 0xcc},
+       {0xb6, 0x22, 0x12, 0xcc},
+       {0xb6, 0x23, 0x0b, 0xcc},
+       {0xb3, 0x02, 0x02, 0xcc},
+       {0xbf, 0xc0, 0x39, 0xcc},
+       {0xbf, 0xc1, 0x04, 0xcc},
+       {0xbf, 0xcc, 0x10, 0xcc},
+       {0xb9, 0x12, 0x00, 0xcc},
+       {0xb9, 0x13, 0x14, 0xcc},
+       {0xb9, 0x14, 0x14, 0xcc},
+       {0xb9, 0x15, 0x14, 0xcc},
+       {0xb9, 0x16, 0x14, 0xcc},
+       {0xb9, 0x18, 0x00, 0xcc},
+       {0xb9, 0x19, 0x1e, 0xcc},
+       {0xb9, 0x1a, 0x1e, 0xcc},
+       {0xb9, 0x1b, 0x1e, 0xcc},
+       {0xb9, 0x1c, 0x1e, 0xcc},
+       {0xb3, 0x01, 0x41, 0xcc},
+       {0xb8, 0x8e, 0x00, 0xcc},
+       {0xb8, 0x8f, 0xff, 0xcc},
+       {0xb6, 0x12, 0xf8, 0xcc},
+       {0xb8, 0x0c, 0x20, 0xcc},
+       {0xb8, 0x0d, 0x70, 0xcc},
+       {0xb6, 0x13, 0x13, 0xcc},
+       {0x2f, 0x00, 0xC0, 0xbb},
+       {0xb8, 0xa0, 0x12, 0xcc},
+       {}
 };
 
 static const __u8 mi1320_gamma[17] = {
@@ -778,6 +910,345 @@ static const __u8 mi1320_initQVGA_data[][4] = {
        {}
 };
 
+static const u8 mi1320_soc_InitVGA[][4] = {
+       {0xb3, 0x01, 0x01, 0xcc},
+       {0xb0, 0x03, 0x19, 0xcc},
+       {0xb0, 0x04, 0x02, 0xcc},
+       {0x00, 0x00, 0x30, 0xdd},
+       {0xb3, 0x00, 0x64, 0xcc},
+       {0xb3, 0x00, 0x67, 0xcc},
+       {0xb3, 0x05, 0x01, 0xcc},
+       {0xb3, 0x06, 0x01, 0xcc},
+       {0xb3, 0x08, 0x01, 0xcc},
+       {0xb3, 0x09, 0x0c, 0xcc},
+       {0xb3, 0x34, 0x02, 0xcc},
+       {0xb3, 0x35, 0xc8, 0xcc},
+       {0xb3, 0x02, 0x00, 0xcc},
+       {0xb3, 0x03, 0x0a, 0xcc},
+       {0xb3, 0x04, 0x05, 0xcc},
+       {0xb3, 0x20, 0x00, 0xcc},
+       {0xb3, 0x21, 0x00, 0xcc},
+       {0xb3, 0x22, 0x01, 0xcc},
+       {0xb3, 0x23, 0xe0, 0xcc},
+       {0xb3, 0x14, 0x00, 0xcc},
+       {0xb3, 0x15, 0x00, 0xcc},
+       {0xb3, 0x16, 0x02, 0xcc},
+       {0xb3, 0x17, 0x7f, 0xcc},
+       {0xb3, 0x00, 0x67, 0xcc},
+       {0xb8, 0x00, 0x00, 0xcc},
+       {0xbc, 0x00, 0x71, 0xcc},
+       {0xbc, 0x01, 0x01, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0xc8, 0x00, 0x00, 0xbb},
+       {0x00, 0x00, 0x30, 0xdd},
+       {0xf0, 0x00, 0x00, 0xbb},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0x07, 0x00, 0xe0, 0xbb},
+       {0x08, 0x00, 0x0b, 0xbb},
+       {0x21, 0x00, 0x0c, 0xbb},
+       {0x20, 0x01, 0x03, 0xbb},
+       {0xbf, 0xc0, 0x26, 0xcc},
+       {0xbf, 0xc1, 0x02, 0xcc},
+       {0xbf, 0xcc, 0x04, 0xcc},
+       {0xb3, 0x01, 0x41, 0xcc},
+       {0xf0, 0x00, 0x00, 0xbb},
+       {0x05, 0x01, 0x78, 0xbb},
+       {0x06, 0x00, 0x11, 0xbb},
+       {0x07, 0x01, 0x42, 0xbb},
+       {0x08, 0x00, 0x11, 0xbb},
+       {0x20, 0x01, 0x03, 0xbb},
+       {0x21, 0x80, 0x00, 0xbb},
+       {0x22, 0x0d, 0x0f, 0xbb},
+       {0x24, 0x80, 0x00, 0xbb},
+       {0x59, 0x00, 0xff, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x39, 0x03, 0xca, 0xbb},
+       {0x3a, 0x06, 0x80, 0xbb},
+       {0x3b, 0x01, 0x52, 0xbb},
+       {0x3c, 0x05, 0x40, 0xbb},
+       {0x57, 0x01, 0x9c, 0xbb},
+       {0x58, 0x01, 0xee, 0xbb},
+       {0x59, 0x00, 0xf0, 0xbb},
+       {0x5a, 0x01, 0x20, 0xbb},
+       {0x5c, 0x1d, 0x17, 0xbb},
+       {0x5d, 0x22, 0x1c, 0xbb},
+       {0x64, 0x1e, 0x1c, 0xbb},
+       {0x5b, 0x00, 0x00, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x22, 0xa0, 0x78, 0xbb},
+       {0x23, 0xa0, 0x78, 0xbb},
+       {0x24, 0x7f, 0x00, 0xbb},
+       {0x28, 0xea, 0x02, 0xbb},
+       {0x29, 0x86, 0x7a, 0xbb},
+       {0x5e, 0x52, 0x4c, 0xbb},
+       {0x5f, 0x20, 0x24, 0xbb},
+       {0x60, 0x00, 0x02, 0xbb},
+       {0x02, 0x00, 0xee, 0xbb},
+       {0x03, 0x39, 0x23, 0xbb},
+       {0x04, 0x07, 0x24, 0xbb},
+       {0x09, 0x00, 0xc0, 0xbb},
+       {0x0a, 0x00, 0x79, 0xbb},
+       {0x0b, 0x00, 0x04, 0xbb},
+       {0x0c, 0x00, 0x5c, 0xbb},
+       {0x0d, 0x00, 0xd9, 0xbb},
+       {0x0e, 0x00, 0x53, 0xbb},
+       {0x0f, 0x00, 0x21, 0xbb},
+       {0x10, 0x00, 0xa4, 0xbb},
+       {0x11, 0x00, 0xe5, 0xbb},
+       {0x15, 0x00, 0x00, 0xbb},
+       {0x16, 0x00, 0x00, 0xbb},
+       {0x17, 0x00, 0x00, 0xbb},
+       {0x18, 0x00, 0x00, 0xbb},
+       {0x19, 0x00, 0x00, 0xbb},
+       {0x1a, 0x00, 0x00, 0xbb},
+       {0x1b, 0x00, 0x00, 0xbb},
+       {0x1c, 0x00, 0x00, 0xbb},
+       {0x1d, 0x00, 0x00, 0xbb},
+       {0x1e, 0x00, 0x00, 0xbb},
+       {0xf0, 0x00, 0x01, 0xbb},
+       {0x06, 0xe0, 0x0e, 0xbb},
+       {0x06, 0x60, 0x0e, 0xbb},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {}
+};
+static const u8 mi1320_soc_InitQVGA[][4] = {
+       {0xb3, 0x01, 0x01, 0xcc},
+       {0xb0, 0x03, 0x19, 0xcc},
+       {0xb0, 0x04, 0x02, 0xcc},
+       {0x00, 0x00, 0x30, 0xdd},
+       {0xb3, 0x00, 0x64, 0xcc},
+       {0xb3, 0x00, 0x67, 0xcc},
+       {0xb3, 0x05, 0x01, 0xcc},
+       {0xb3, 0x06, 0x01, 0xcc},
+       {0xb3, 0x08, 0x01, 0xcc},
+       {0xb3, 0x09, 0x0c, 0xcc},
+       {0xb3, 0x34, 0x02, 0xcc},
+       {0xb3, 0x35, 0xc8, 0xcc},
+       {0xb3, 0x02, 0x00, 0xcc},
+       {0xb3, 0x03, 0x0a, 0xcc},
+       {0xb3, 0x04, 0x05, 0xcc},
+       {0xb3, 0x20, 0x00, 0xcc},
+       {0xb3, 0x21, 0x00, 0xcc},
+       {0xb3, 0x22, 0x01, 0xcc},
+       {0xb3, 0x23, 0xe0, 0xcc},
+       {0xb3, 0x14, 0x00, 0xcc},
+       {0xb3, 0x15, 0x00, 0xcc},
+       {0xb3, 0x16, 0x02, 0xcc},
+       {0xb3, 0x17, 0x7f, 0xcc},
+       {0xb3, 0x00, 0x67, 0xcc},
+       {0xb8, 0x00, 0x00, 0xcc},
+       {0xbc, 0x00, 0xd1, 0xcc},
+       {0xbc, 0x01, 0x01, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0xc8, 0x00, 0x00, 0xbb},
+       {0x00, 0x00, 0x30, 0xdd},
+       {0xf0, 0x00, 0x00, 0xbb},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0x07, 0x00, 0xe0, 0xbb},
+       {0x08, 0x00, 0x0b, 0xbb},
+       {0x21, 0x00, 0x0c, 0xbb},
+       {0x20, 0x01, 0x03, 0xbb},
+       {0xbf, 0xc0, 0x26, 0xcc},
+       {0xbf, 0xc1, 0x02, 0xcc},
+       {0xbf, 0xcc, 0x04, 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, 0x01, 0x41, 0xcc},
+       {0xf0, 0x00, 0x00, 0xbb},
+       {0x05, 0x01, 0x78, 0xbb},
+       {0x06, 0x00, 0x11, 0xbb},
+       {0x07, 0x01, 0x42, 0xbb},
+       {0x08, 0x00, 0x11, 0xbb},
+       {0x20, 0x01, 0x03, 0xbb},
+       {0x21, 0x80, 0x00, 0xbb},
+       {0x22, 0x0d, 0x0f, 0xbb},
+       {0x24, 0x80, 0x00, 0xbb},
+       {0x59, 0x00, 0xff, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x39, 0x03, 0xca, 0xbb},
+       {0x3a, 0x06, 0x80, 0xbb},
+       {0x3b, 0x01, 0x52, 0xbb},
+       {0x3c, 0x05, 0x40, 0xbb},
+       {0x57, 0x01, 0x9c, 0xbb},
+       {0x58, 0x01, 0xee, 0xbb},
+       {0x59, 0x00, 0xf0, 0xbb},
+       {0x5a, 0x01, 0x20, 0xbb},
+       {0x5c, 0x1d, 0x17, 0xbb},
+       {0x5d, 0x22, 0x1c, 0xbb},
+       {0x64, 0x1e, 0x1c, 0xbb},
+       {0x5b, 0x00, 0x00, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x22, 0xa0, 0x78, 0xbb},
+       {0x23, 0xa0, 0x78, 0xbb},
+       {0x24, 0x7f, 0x00, 0xbb},
+       {0x28, 0xea, 0x02, 0xbb},
+       {0x29, 0x86, 0x7a, 0xbb},
+       {0x5e, 0x52, 0x4c, 0xbb},
+       {0x5f, 0x20, 0x24, 0xbb},
+       {0x60, 0x00, 0x02, 0xbb},
+       {0x02, 0x00, 0xee, 0xbb},
+       {0x03, 0x39, 0x23, 0xbb},
+       {0x04, 0x07, 0x24, 0xbb},
+       {0x09, 0x00, 0xc0, 0xbb},
+       {0x0a, 0x00, 0x79, 0xbb},
+       {0x0b, 0x00, 0x04, 0xbb},
+       {0x0c, 0x00, 0x5c, 0xbb},
+       {0x0d, 0x00, 0xd9, 0xbb},
+       {0x0e, 0x00, 0x53, 0xbb},
+       {0x0f, 0x00, 0x21, 0xbb},
+       {0x10, 0x00, 0xa4, 0xbb},
+       {0x11, 0x00, 0xe5, 0xbb},
+       {0x15, 0x00, 0x00, 0xbb},
+       {0x16, 0x00, 0x00, 0xbb},
+       {0x17, 0x00, 0x00, 0xbb},
+       {0x18, 0x00, 0x00, 0xbb},
+       {0x19, 0x00, 0x00, 0xbb},
+       {0x1a, 0x00, 0x00, 0xbb},
+       {0x1b, 0x00, 0x00, 0xbb},
+       {0x1c, 0x00, 0x00, 0xbb},
+       {0x1d, 0x00, 0x00, 0xbb},
+       {0x1e, 0x00, 0x00, 0xbb},
+       {0xf0, 0x00, 0x01, 0xbb},
+       {0x06, 0xe0, 0x0e, 0xbb},
+       {0x06, 0x60, 0x0e, 0xbb},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {}
+};
+static const u8 mi1320_soc_InitSXGA[][4] = {
+       {0xb3, 0x01, 0x01, 0xcc},
+       {0xb0, 0x03, 0x19, 0xcc},
+       {0x00, 0x00, 0x30, 0xdd},
+       {0xb3, 0x00, 0x64, 0xcc},
+       {0xb3, 0x00, 0x67, 0xcc},
+       {0xb3, 0x05, 0x01, 0xcc},
+       {0xb3, 0x06, 0x01, 0xcc},
+       {0xb3, 0x08, 0x01, 0xcc},
+       {0xb3, 0x09, 0x0c, 0xcc},
+       {0xb3, 0x34, 0x02, 0xcc},
+       {0xb3, 0x35, 0xc8, 0xcc},
+       {0xb3, 0x02, 0x00, 0xcc},
+       {0xb3, 0x03, 0x0a, 0xcc},
+       {0xb3, 0x04, 0x05, 0xcc},
+       {0xb3, 0x20, 0x00, 0xcc},
+       {0xb3, 0x21, 0x00, 0xcc},
+       {0xb3, 0x22, 0x04, 0xcc},
+       {0xb3, 0x23, 0x00, 0xcc},
+       {0xb3, 0x14, 0x00, 0xcc},
+       {0xb3, 0x15, 0x00, 0xcc},
+       {0xb3, 0x16, 0x04, 0xcc},
+       {0xb3, 0x17, 0xff, 0xcc},
+       {0xb3, 0x00, 0x67, 0xcc},
+       {0xbc, 0x00, 0x71, 0xcc},
+       {0xbc, 0x01, 0x01, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x00, 0x00, 0x30, 0xdd},
+       {0xc8, 0x9f, 0x0b, 0xbb},
+       {0x00, 0x00, 0x20, 0xdd},
+       {0x5b, 0x00, 0x01, 0xbb},
+       {0x00, 0x00, 0x20, 0xdd},
+       {0xf0, 0x00, 0x00, 0xbb},
+       {0x00, 0x00, 0x30, 0xdd},
+       {0x20, 0x01, 0x03, 0xbb},
+       {0x00, 0x00, 0x20, 0xdd},
+       {0xbf, 0xc0, 0x26, 0xcc},
+       {0xbf, 0xc1, 0x02, 0xcc},
+       {0xbf, 0xcc, 0x04, 0xcc},
+       {0xb3, 0x01, 0x41, 0xcc},
+       {0xf0, 0x00, 0x00, 0xbb},
+       {0x05, 0x01, 0x78, 0xbb},
+       {0x06, 0x00, 0x11, 0xbb},
+       {0x07, 0x01, 0x42, 0xbb},
+       {0x08, 0x00, 0x11, 0xbb},
+       {0x20, 0x01, 0x03, 0xbb},
+       {0x21, 0x80, 0x00, 0xbb},
+       {0x22, 0x0d, 0x0f, 0xbb},
+       {0x24, 0x80, 0x00, 0xbb},
+       {0x59, 0x00, 0xff, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x39, 0x03, 0xca, 0xbb},
+       {0x3a, 0x06, 0x80, 0xbb},
+       {0x3b, 0x01, 0x52, 0xbb},
+       {0x3c, 0x05, 0x40, 0xbb},
+       {0x57, 0x01, 0x9c, 0xbb},
+       {0x58, 0x01, 0xee, 0xbb},
+       {0x59, 0x00, 0xf0, 0xbb},
+       {0x5a, 0x01, 0x20, 0xbb},
+       {0x5c, 0x1d, 0x17, 0xbb},
+       {0x5d, 0x22, 0x1c, 0xbb},
+       {0x64, 0x1e, 0x1c, 0xbb},
+       {0x5b, 0x00, 0x00, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x22, 0xa0, 0x78, 0xbb},
+       {0x23, 0xa0, 0x78, 0xbb},
+       {0x24, 0x7f, 0x00, 0xbb},
+       {0x28, 0xea, 0x02, 0xbb},
+       {0x29, 0x86, 0x7a, 0xbb},
+       {0x5e, 0x52, 0x4c, 0xbb},
+       {0x5f, 0x20, 0x24, 0xbb},
+       {0x60, 0x00, 0x02, 0xbb},
+       {0x02, 0x00, 0xee, 0xbb},
+       {0x03, 0x39, 0x23, 0xbb},
+       {0x04, 0x07, 0x24, 0xbb},
+       {0x09, 0x00, 0xc0, 0xbb},
+       {0x0a, 0x00, 0x79, 0xbb},
+       {0x0b, 0x00, 0x04, 0xbb},
+       {0x0c, 0x00, 0x5c, 0xbb},
+       {0x0d, 0x00, 0xd9, 0xbb},
+       {0x0e, 0x00, 0x53, 0xbb},
+       {0x0f, 0x00, 0x21, 0xbb},
+       {0x10, 0x00, 0xa4, 0xbb},
+       {0x11, 0x00, 0xe5, 0xbb},
+       {0x15, 0x00, 0x00, 0xbb},
+       {0x16, 0x00, 0x00, 0xbb},
+       {0x17, 0x00, 0x00, 0xbb},
+       {0x18, 0x00, 0x00, 0xbb},
+       {0x19, 0x00, 0x00, 0xbb},
+       {0x1a, 0x00, 0x00, 0xbb},
+       {0x1b, 0x00, 0x00, 0xbb},
+       {0x1c, 0x00, 0x00, 0xbb},
+       {0x1d, 0x00, 0x00, 0xbb},
+       {0x1e, 0x00, 0x00, 0xbb},
+       {0xf0, 0x00, 0x01, 0xbb},
+       {0x06, 0xe0, 0x0e, 0xbb},
+       {0x06, 0x60, 0x0e, 0xbb},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {0xf0, 0x00, 0x00, 0xbb},
+       {0x05, 0x01, 0x13, 0xbb},
+       {0x06, 0x00, 0x11, 0xbb},
+       {0x07, 0x00, 0x85, 0xbb},
+       {0x08, 0x00, 0x27, 0xbb},
+       {0x20, 0x01, 0x03, 0xbb},
+       {0x21, 0x80, 0x00, 0xbb},
+       {0x22, 0x0d, 0x0f, 0xbb},
+       {0x24, 0x80, 0x00, 0xbb},
+       {0x59, 0x00, 0xff, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x39, 0x03, 0x0d, 0xbb},
+       {0x3a, 0x06, 0x1b, 0xbb},
+       {0x3b, 0x00, 0x95, 0xbb},
+       {0x3c, 0x04, 0xdb, 0xbb},
+       {0x57, 0x02, 0x00, 0xbb},
+       {0x58, 0x02, 0x66, 0xbb},
+       {0x59, 0x00, 0xff, 0xbb},
+       {0x5a, 0x01, 0x33, 0xbb},
+       {0x5c, 0x12, 0x0d, 0xbb},
+       {0x5d, 0x16, 0x11, 0xbb},
+       {0x64, 0x5e, 0x1c, 0xbb},
+       {}
+};
 static const __u8 po3130_gamma[17] = {
        0x00, 0x13, 0x38, 0x59, 0x79, 0x92, 0xa7, 0xb9, 0xc8,
        0xd4, 0xdf, 0xe7, 0xee, 0xf4, 0xf9, 0xfc, 0xff
@@ -1764,26 +2235,43 @@ static const __u8 po1200_initVGA_data[][4] = {
 };
 
 struct sensor_info {
-       int sensorId;
-       __u8 I2cAdd;
-       __u8 IdAdd;
-       __u16 VpId;
-       __u8 m1;
-       __u8 m2;
-       __u8 op;
-       };
+       s8 sensorId;
+       u8 I2cAdd;
+       u8 IdAdd;
+       u16 VpId;
+       u8 m1;
+       u8 m2;
+       u8 op;
+};
 
 static const struct sensor_info sensor_info_data[] = {
 /*      sensorId,         I2cAdd,      IdAdd,  VpId,  m1,    m2,  op */
-       {SENSOR_HV7131R,    0x80 | 0x11, 0x00, 0x0209, 0x24, 0x25, 0x01},
-       {SENSOR_OV7660,     0x80 | 0x21, 0x0a, 0x7660, 0x26, 0x26, 0x05},
+       {-1,                0x80 | 0x30, 0x0a, 0x0000, 0x25, 0x24, 0x05},
+       {-1,                0x80 | 0x20, 0x82, 0x0000, 0x24, 0x25, 0x01},
+/* (tested in vc032x_probe_sensor) */
+/*     {-1,                0x80 | 0x20, 0x83, 0x0000, 0x24, 0x25, 0x01}, */
        {SENSOR_PO3130NC,   0x80 | 0x76, 0x00, 0x3130, 0x24, 0x25, 0x01},
-       {SENSOR_MI1320,     0x80 | 0xc8, 0x00, 0x148c, 0x64, 0x65, 0x01},
-       {SENSOR_OV7670,     0x80 | 0x21, 0x0a, 0x7673, 0x66, 0x67, 0x05},
        {SENSOR_MI1310_SOC, 0x80 | 0x5d, 0x00, 0x143a, 0x24, 0x25, 0x01},
 /* (tested in vc032x_probe_sensor) */
 /*     {SENSOR_MI0360,     0x80 | 0x5d, 0x00, 0x8243, 0x24, 0x25, 0x01}, */
+       {SENSOR_HV7131R,    0x80 | 0x11, 0x00, 0x0209, 0x24, 0x25, 0x01},
+       {-1,                0x80 | 0x21, 0x0a, 0x0000, 0x21, 0x20, 0x05},
+       {-1,                0x80 | 0x40, 0x00, 0x0000, 0x20, 0x22, 0x05},
+       {SENSOR_OV7660,     0x80 | 0x21, 0x0a, 0x7660, 0x26, 0x26, 0x05},
+/*     {SENSOR_PO3130NC,   0x80 | 0x76, 0x00, 0x0000, 0x24, 0x25, 0x01}, */
+       {-1,                0x80 | 0x6e, 0x00, 0x0000, 0x24, 0x25, 0x01},
+/*     {SENSOR_MI1310_SOC, 0x80 | 0x5d, 0x00, 0x0000, 0x24, 0x25, 0x01}, */
+/*     {-1,                0x80 | 0x30, 0x0a, 0x0000, 0x25, 0x24, 0x05}, */
+       {-1,                0x80 | 0x11, 0x39, 0x0000, 0x24, 0x25, 0x01},
        {SENSOR_PO1200,     0x80 | 0x5c, 0x00, 0x1200, 0x67, 0x67, 0x01},
+       {-1,                0x80 | 0x2d, 0x00, 0x0000, 0x65, 0x67, 0x01},
+       {-1,                0x80 | 0x6e, 0x00, 0x0000, 0x24, 0x25, 0x01},
+       {-1,                0x80 | 0x56, 0x01, 0x0000, 0x64, 0x67, 0x01},
+       {SENSOR_MI1320_SOC, 0x80 | 0x48, 0x00, 0x148c, 0x64, 0x67, 0x01},
+/*fixme: previously detected?*/
+       {SENSOR_MI1320,     0x80 | 0x48, 0x00, 0x148c, 0x64, 0x65, 0x01},
+/*fixme: not in the ms-win probe - may be found before?*/
+       {SENSOR_OV7670,     0x80 | 0x21, 0x0a, 0x7673, 0x66, 0x67, 0x05},
 };
 
 /* read 'len' bytes in gspca_dev->usb_buf */
@@ -1814,51 +2302,49 @@ static void reg_w(struct usb_device *dev,
                        500);
 }
 
-static void read_sensor_register(struct gspca_dev *gspca_dev,
-                               __u16 address, __u16 *value)
+static u16 read_sensor_register(struct gspca_dev *gspca_dev,
+                               u16 address)
 {
        struct usb_device *dev = gspca_dev->dev;
-       __u8 ldata, mdata, hdata;
+       u8 ldata, mdata, hdata;
        int retry = 50;
 
-       *value = 0;
-
        reg_r(gspca_dev, 0xa1, 0xb33f, 1);
-       /*PDEBUG(D_PROBE, " I2c Bus Busy Wait  0x%02X ", tmpvalue); */
        if (!(gspca_dev->usb_buf[0] & 0x02)) {
-               PDEBUG(D_ERR, "I2c Bus Busy Wait %d",
-                       gspca_dev->usb_buf[0] & 0x02);
-               return;
+               PDEBUG(D_ERR, "I2c Bus Busy Wait %02x",
+                       gspca_dev->usb_buf[0]);
+               return 0;
        }
        reg_w(dev, 0xa0, address, 0xb33a);
        reg_w(dev, 0xa0, 0x02, 0xb339);
 
-       reg_r(gspca_dev, 0xa1, 0xb33b, 1);
-       while (retry-- && gspca_dev->usb_buf[0]) {
+       do {
                reg_r(gspca_dev, 0xa1, 0xb33b, 1);
-/*             PDEBUG(D_PROBE, "Read again 0xb33b %d", tmpvalue); */
-               msleep(1);
-       }
+               if (gspca_dev->usb_buf[0] == 0x00)
+                       break;
+               msleep(40);
+       } while (--retry >= 0);
+
        reg_r(gspca_dev, 0xa1, 0xb33e, 1);
        ldata = gspca_dev->usb_buf[0];
        reg_r(gspca_dev, 0xa1, 0xb33d, 1);
        mdata = gspca_dev->usb_buf[0];
        reg_r(gspca_dev, 0xa1, 0xb33c, 1);
        hdata = gspca_dev->usb_buf[0];
-       PDEBUG(D_PROBE, "Read Sensor %02x%02x %02x",
-               hdata, mdata, ldata);
+       if (hdata != 0 && mdata != 0 && ldata != 0)
+               PDEBUG(D_PROBE, "Read Sensor %02x%02x %02x",
+                       hdata, mdata, ldata);
        reg_r(gspca_dev, 0xa1, 0xb334, 1);
        if (gspca_dev->usb_buf[0] == 0x02)
-               *value = (hdata << 8) + mdata;
-       else
-               *value = hdata;
+               return (hdata << 8) + mdata;
+       return hdata;
 }
 
 static int vc032x_probe_sensor(struct gspca_dev *gspca_dev)
 {
        struct usb_device *dev = gspca_dev->dev;
        int i;
-       __u16 value;
+       u16 value;
        const struct sensor_info *ptsensor_info;
 
        reg_r(gspca_dev, 0xa1, 0xbfcf, 1);
@@ -1872,48 +2358,51 @@ static int vc032x_probe_sensor(struct gspca_dev *gspca_dev)
                reg_w(dev, 0xa0, 0x0c, 0xb309);
                reg_w(dev, 0xa0, ptsensor_info->I2cAdd, 0xb335);
                reg_w(dev, 0xa0, ptsensor_info->op, 0xb301);
-               read_sensor_register(gspca_dev, ptsensor_info->IdAdd, &value);
-               if (value == ptsensor_info->VpId)
-                       return ptsensor_info->sensorId;
-
-               /* special case for MI0360 */
-               if (ptsensor_info->sensorId == SENSOR_MI1310_SOC
-                   && value == 0x8243)
-                       return SENSOR_MI0360;
+               value = read_sensor_register(gspca_dev, ptsensor_info->IdAdd);
+               if (value == 0 && ptsensor_info->IdAdd == 0x82)
+                       value = read_sensor_register(gspca_dev, 0x83);
+               if (value != 0) {
+                       PDEBUG(D_ERR|D_PROBE, "Sensor ID %04x (%d)",
+                               value, i);
+                       if (value == ptsensor_info->VpId)
+                               return ptsensor_info->sensorId;
+
+                       switch (value) {
+                       case 0x7673:
+                               return SENSOR_OV7670;
+                       case 0x8243:
+                               return SENSOR_MI0360;
+                       }
+/*fixme: should return here*/
+               }
        }
        return -1;
 }
 
-static __u8 i2c_write(struct gspca_dev *gspca_dev,
-                       __u8 reg, const __u8 *val, __u8 size)
+static void i2c_write(struct gspca_dev *gspca_dev,
+                       u8 reg, const u8 *val,
+                       u8 size)                /* 1 or 2 */
 {
        struct usb_device *dev = gspca_dev->dev;
+       int retry;
 
-       if (size > 3 || size < 1)
-               return -EINVAL;
        reg_r(gspca_dev, 0xa1, 0xb33f, 1);
+/*fixme:should check if (!(gspca_dev->usb_buf[0] & 0x02)) error*/
        reg_w(dev, 0xa0, size, 0xb334);
        reg_w(dev, 0xa0, reg, 0xb33a);
-       switch (size) {
-       case 1:
-               reg_w(dev, 0xa0, val[0], 0xb336);
-               break;
-       case 2:
-               reg_w(dev, 0xa0, val[0], 0xb336);
-               reg_w(dev, 0xa0, val[1], 0xb337);
-               break;
-       case 3:
-               reg_w(dev, 0xa0, val[0], 0xb336);
+       reg_w(dev, 0xa0, val[0], 0xb336);
+       if (size > 1)
                reg_w(dev, 0xa0, val[1], 0xb337);
-               reg_w(dev, 0xa0, val[2], 0xb338);
-               break;
-       default:
-               reg_w(dev, 0xa0, 0x01, 0xb334);
-               return -EINVAL;
-       }
        reg_w(dev, 0xa0, 0x01, 0xb339);
-       reg_r(gspca_dev, 0xa1, 0xb33b, 1);
-       return gspca_dev->usb_buf[0] == 0;
+       retry = 4;
+       do {
+               reg_r(gspca_dev, 0xa1, 0xb33b, 1);
+               if (gspca_dev->usb_buf[0] == 0)
+                       break;
+               msleep(20);
+       } while (--retry > 0);
+       if (retry <= 0)
+               PDEBUG(D_ERR, "i2c_write failed");
 }
 
 static void put_tab_to_reg(struct gspca_dev *gspca_dev,
@@ -1938,7 +2427,7 @@ static void usb_exchange(struct gspca_dev *gspca_dev,
                        return;
                case 0xcc:                      /* normal write */
                        reg_w(dev, 0xa0, data[i][2],
-                                       ((data[i][0])<<8) | data[i][1]);
+                                       (data[i][0]) << 8 | data[i][1]);
                        break;
                case 0xaa:                      /* i2c op */
                        i2c_write(gspca_dev, data[i][1], &data[i][2], 1);
@@ -1955,19 +2444,6 @@ static void usb_exchange(struct gspca_dev *gspca_dev,
        /*not reached*/
 }
 
-/*
- "GammaT"=hex:04,17,31,4f,6a,83,99,ad,bf,ce,da,e5,ee,f5,fb,ff,ff
- "MatrixT"=hex:60,f9,e5,e7,50,05,f3,e6,66
- */
-
-static void vc0321_reset(struct gspca_dev *gspca_dev)
-{
-       reg_w(gspca_dev->dev, 0xa0, 0x00, 0xb04d);
-       reg_w(gspca_dev->dev, 0xa0, 0x01, 0xb301);
-       msleep(100);
-       reg_w(gspca_dev->dev, 0xa0, 0x01, 0xb003);
-       msleep(100);
-}
 
 /* this function is called at probe time */
 static int sd_config(struct gspca_dev *gspca_dev,
@@ -1979,10 +2455,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
        int sensor;
 
        cam = &gspca_dev->cam;
-       cam->epaddr = 0x02;
        sd->bridge = id->driver_info;
-
-       vc0321_reset(gspca_dev);
        sensor = vc032x_probe_sensor(gspca_dev);
        switch (sensor) {
        case -1:
@@ -2001,6 +2474,9 @@ static int sd_config(struct gspca_dev *gspca_dev,
        case SENSOR_MI1320:
                PDEBUG(D_PROBE, "Find Sensor MI1320");
                break;
+       case SENSOR_MI1320_SOC:
+               PDEBUG(D_PROBE, "Find Sensor MI1320_SOC");
+               break;
        case SENSOR_OV7660:
                PDEBUG(D_PROBE, "Find Sensor OV7660");
                break;
@@ -2020,12 +2496,23 @@ static int sd_config(struct gspca_dev *gspca_dev,
                cam->cam_mode = vc0321_mode;
                cam->nmodes = ARRAY_SIZE(vc0321_mode);
        } else {
-               if (sensor != SENSOR_PO1200) {
-                       cam->cam_mode = vc0323_mode;
-                       cam->nmodes = ARRAY_SIZE(vc0323_mode);
-               } else {
+               switch (sensor) {
+               case SENSOR_PO1200:
                        cam->cam_mode = svga_mode;
                        cam->nmodes = ARRAY_SIZE(svga_mode);
+                       break;
+               case SENSOR_MI1310_SOC:
+                       cam->cam_mode = vc0323_mode;
+                       cam->nmodes = ARRAY_SIZE(vc0323_mode);
+                       break;
+               case SENSOR_MI1320_SOC:
+                       cam->cam_mode = bi_mode;
+                       cam->nmodes = ARRAY_SIZE(bi_mode);
+                       break;
+               default:
+                       cam->cam_mode = vc0323_mode;
+                       cam->nmodes = ARRAY_SIZE(vc0323_mode) - 1;
+                       break;
                }
        }
 
@@ -2061,7 +2548,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
        return 0;
 }
 
-/* this function is called at probe and time */
+/* this function is called at probe and resume time */
 static int sd_init(struct gspca_dev *gspca_dev)
 {
        return 0;
@@ -2124,9 +2611,15 @@ static void setsharpness(struct gspca_dev *gspca_dev)
 static int sd_start(struct gspca_dev *gspca_dev)
 {
        struct sd *sd = (struct sd *) gspca_dev;
+       const __u8 (*init)[4];
        const __u8 *GammaT = NULL;
        const __u8 *MatrixT = NULL;
        int mode;
+       static const u8 (*mi1320_soc_init[])[4] = {
+               mi1320_soc_InitSXGA,
+               mi1320_soc_InitVGA,
+               mi1320_soc_InitQVGA,
+       };
 
        /* Assume start use the good resolution from gspca_dev->mode */
        if (sd->bridge == BRIDGE_VC0321) {
@@ -2134,6 +2627,13 @@ static int sd_start(struct gspca_dev *gspca_dev)
                reg_w(gspca_dev->dev, 0xa0, 0xff, 0xbfed);
                reg_w(gspca_dev->dev, 0xa0, 0xff, 0xbfee);
                reg_w(gspca_dev->dev, 0xa0, 0xff, 0xbfef);
+               sd->image_offset = 46;
+       } else {
+               if (gspca_dev->cam.cam_mode[gspca_dev->curr_mode].pixelformat
+                               == V4L2_PIX_FMT_JPEG)
+                       sd->image_offset = 0;
+               else
+                       sd->image_offset = 32;
        }
 
        mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
@@ -2141,115 +2641,87 @@ static int sd_start(struct gspca_dev *gspca_dev)
        case SENSOR_HV7131R:
                GammaT = hv7131r_gamma;
                MatrixT = hv7131r_matrix;
-               if (mode) {
-                       /* 320x240 */
-                       usb_exchange(gspca_dev, hv7131r_initQVGA_data);
-               } else {
-                       /* 640x480 */
-                       usb_exchange(gspca_dev, hv7131r_initVGA_data);
-               }
+               if (mode)
+                       init = hv7131r_initQVGA_data;   /* 320x240 */
+               else
+                       init = hv7131r_initVGA_data;    /* 640x480 */
                break;
        case SENSOR_OV7660:
                GammaT = ov7660_gamma;
                MatrixT = ov7660_matrix;
-               if (mode) {
-                       /* 320x240 */
-                       usb_exchange(gspca_dev, ov7660_initQVGA_data);
-               } else {
-                       /* 640x480 */
-                       usb_exchange(gspca_dev, ov7660_initVGA_data);
-               }
+               if (mode)
+                       init = ov7660_initQVGA_data;    /* 320x240 */
+               else
+                       init = ov7660_initVGA_data;     /* 640x480 */
                break;
        case SENSOR_OV7670:
                /*GammaT = ov7660_gamma; */
                /*MatrixT = ov7660_matrix; */
-               if (mode) {
-                       /* 320x240 */
-                       usb_exchange(gspca_dev, ov7670_initQVGA_JPG);
-               } else {
-                       /* 640x480 */
-                       usb_exchange(gspca_dev, ov7670_initVGA_JPG);
-               }
+               if (mode)
+                       init = ov7670_initQVGA_JPG;     /* 320x240 */
+               else
+                       init = ov7670_initVGA_JPG;      /* 640x480 */
                break;
        case SENSOR_MI0360:
                GammaT = mi1320_gamma;
                MatrixT = mi0360_matrix;
-               if (mode) {
-                       /* 320x240 */
-                       usb_exchange(gspca_dev, mi0360_initQVGA_JPG);
-               } else {
-                       /* 640x480 */
-                       usb_exchange(gspca_dev, mi0360_initVGA_JPG);
-               }
+               if (mode)
+                       init = mi0360_initQVGA_JPG;     /* 320x240 */
+               else
+                       init = mi0360_initVGA_JPG;      /* 640x480 */
                break;
        case SENSOR_MI1310_SOC:
-               if (mode) {
-                       /* 320x240 */
-                       usb_exchange(gspca_dev, mi1310_socinitQVGA_JPG);
-               } else {
-                       /* 640x480 */
-                       usb_exchange(gspca_dev, mi1310_socinitVGA_JPG);
+               GammaT = mi1320_gamma;
+               MatrixT = mi1320_matrix;
+               switch (mode) {
+               case 1:
+                       init = mi1310_socinitQVGA_JPG;  /* 320x240 */
+                       break;
+               case 0:
+                       init = mi1310_socinitVGA_JPG;   /* 640x480 */
+                       break;
+               default:
+                       init = mi1310_soc_InitSXGA_JPG; /* 1280x1024 */
+                       break;
                }
                break;
        case SENSOR_MI1320:
                GammaT = mi1320_gamma;
                MatrixT = mi1320_matrix;
-               if (mode) {
-                       /* 320x240 */
-                       usb_exchange(gspca_dev, mi1320_initQVGA_data);
-               } else {
-                       /* 640x480 */
-                       usb_exchange(gspca_dev, mi1320_initVGA_data);
-               }
+               if (mode)
+                       init = mi1320_initQVGA_data;    /* 320x240 */
+               else
+                       init = mi1320_initVGA_data;     /* 640x480 */
+               break;
+       case SENSOR_MI1320_SOC:
+               GammaT = mi1320_gamma;
+               MatrixT = mi1320_matrix;
+               init = mi1320_soc_init[mode];
                break;
        case SENSOR_PO3130NC:
                GammaT = po3130_gamma;
                MatrixT = po3130_matrix;
-               if (mode) {
-                       /* 320x240 */
-                       usb_exchange(gspca_dev, po3130_initQVGA_data);
-               } else {
-                       /* 640x480 */
-                       usb_exchange(gspca_dev, po3130_initVGA_data);
-               }
-               usb_exchange(gspca_dev, po3130_rundata);
+               if (mode)
+                       init = po3130_initQVGA_data;    /* 320x240 */
+               else
+                       init = po3130_initVGA_data;     /* 640x480 */
+               usb_exchange(gspca_dev, init);
+               init = po3130_rundata;
                break;
-       case SENSOR_PO1200:
+       default:
+/*     case SENSOR_PO1200: */
                GammaT = po1200_gamma;
                MatrixT = po1200_matrix;
-               usb_exchange(gspca_dev, po1200_initVGA_data);
+               init = po1200_initVGA_data;
                break;
-       default:
-               PDEBUG(D_PROBE, "Damned !! no sensor found Bye");
-               return -EMEDIUMTYPE;
        }
+       usb_exchange(gspca_dev, init);
        if (GammaT && MatrixT) {
                put_tab_to_reg(gspca_dev, GammaT, 17, 0xb84a);
                put_tab_to_reg(gspca_dev, GammaT, 17, 0xb85b);
                put_tab_to_reg(gspca_dev, GammaT, 17, 0xb86c);
                put_tab_to_reg(gspca_dev, MatrixT, 9, 0xb82c);
 
-               /* Seem SHARPNESS */
-               /*
-               reg_w(gspca_dev->dev, 0xa0, 0x80, 0xb80a);
-               reg_w(gspca_dev->dev, 0xa0, 0xff, 0xb80b);
-               reg_w(gspca_dev->dev, 0xa0, 0xff, 0xb80e);
-               */
-               /* all 0x40 ??? do nothing
-               reg_w(gspca_dev->dev, 0xa0, 0x40, 0xb822);
-               reg_w(gspca_dev->dev, 0xa0, 0x40, 0xb823);
-               reg_w(gspca_dev->dev, 0xa0, 0x40, 0xb824);
-               */
-               /* Only works for HV7131R ??
-               reg_r (gspca_dev, 0xa1, 0xb881, 1);
-               reg_w(gspca_dev->dev, 0xa0, 0xfe01, 0xb881);
-               reg_w(gspca_dev->dev, 0xa0, 0x79, 0xb801);
-               */
-               /* only hv7131r et ov7660
-               reg_w(gspca_dev->dev, 0xa0, 0x20, 0xb827);
-               reg_w(gspca_dev->dev, 0xa0, 0xff, 0xb826); * ISP_GAIN 80
-               reg_w(gspca_dev->dev, 0xa0, 0x23, 0xb800); * ISP CTRL_BAS
-               */
                /* set the led on 0x0892 0x0896 */
                if (sd->sensor != SENSOR_PO1200) {
                        reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
@@ -2296,12 +2768,8 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                        "vc032x header packet found len %d", len);
                frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
                                                data, 0);
-               if (sd->bridge == BRIDGE_VC0321) {
-#define VCHDRSZ 46
-                       data += VCHDRSZ;
-                       len -= VCHDRSZ;
-#undef VCHDRSZ
-               }
+               data += sd->image_offset;
+               len -= sd->image_offset;
                gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
                                data, len);
                return;
@@ -2399,7 +2867,8 @@ static int sd_querymenu(struct gspca_dev *gspca_dev,
                case 1:         /* V4L2_CID_POWER_LINE_FREQUENCY_50HZ */
                        strcpy((char *) menu->name, "50 Hz");
                        return 0;
-               case 2:         /* V4L2_CID_POWER_LINE_FREQUENCY_60HZ */
+               default:
+/*             case 2:          * V4L2_CID_POWER_LINE_FREQUENCY_60HZ */
                        strcpy((char *) menu->name, "60 Hz");
                        return 0;
                }
@@ -2424,6 +2893,7 @@ static const struct sd_desc sd_desc = {
 
 /* -- module initialisation -- */
 static const __devinitdata struct usb_device_id device_table[] = {
+       {USB_DEVICE(0x041e, 0x405b), .driver_info = BRIDGE_VC0323},
        {USB_DEVICE(0x046d, 0x0892), .driver_info = BRIDGE_VC0321},
        {USB_DEVICE(0x046d, 0x0896), .driver_info = BRIDGE_VC0321},
        {USB_DEVICE(0x046d, 0x0897), .driver_info = BRIDGE_VC0321},
@@ -2432,6 +2902,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
        {USB_DEVICE(0x0ac8, 0x0328), .driver_info = BRIDGE_VC0321},
        {USB_DEVICE(0x0ac8, 0xc001), .driver_info = BRIDGE_VC0321},
        {USB_DEVICE(0x0ac8, 0xc002), .driver_info = BRIDGE_VC0321},
+       {USB_DEVICE(0x15b8, 0x6001), .driver_info = BRIDGE_VC0323},
        {USB_DEVICE(0x15b8, 0x6002), .driver_info = BRIDGE_VC0323},
        {USB_DEVICE(0x17ef, 0x4802), .driver_info = BRIDGE_VC0323},
        {}
@@ -2460,8 +2931,11 @@ static struct usb_driver sd_driver = {
 /* -- module insert / remove -- */
 static int __init sd_mod_init(void)
 {
-       if (usb_register(&sd_driver) < 0)
-               return -1;
+       int ret;
+
+       ret = usb_register(&sd_driver);
+       if (ret < 0)
+               return ret;
        PDEBUG(D_PROBE, "registered");
        return 0;
 }