V4L/DVB (13323): gspca - zc3xx: Adjust the exchanges of sensors mi0360soc and pb0330.
[safe/jmp/linux-2.6] / drivers / media / video / gspca / vc032x.c
index 4144e11..589042f 100644 (file)
@@ -24,9 +24,6 @@
 
 #include "gspca.h"
 
-#define DRIVER_VERSION_NUMBER  KERNEL_VERSION(2, 1, 4)
-static const char version[] = "2.1.4";
-
 MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>");
 MODULE_DESCRIPTION("GSPCA/VC032X USB Camera Driver");
 MODULE_LICENSE("GPL");
@@ -35,69 +32,400 @@ MODULE_LICENSE("GPL");
 struct sd {
        struct gspca_dev gspca_dev;     /* !! must be the first item */
 
-       unsigned char autogain;
-       unsigned char lightfreq;
+       u8 hflip;
+       u8 vflip;
+       u8 lightfreq;
+       u8 sharpness;
+
+       u8 image_offset;
 
-       char qindex;
-       char bridge;
+       u8 bridge;
 #define BRIDGE_VC0321 0
 #define BRIDGE_VC0323 1
-       char sensor;
+       u8 sensor;
 #define SENSOR_HV7131R 0
-#define SENSOR_MI1320 1
+#define SENSOR_MI0360 1
 #define SENSOR_MI1310_SOC 2
-#define SENSOR_OV7660 3
-#define SENSOR_OV7670 4
-#define SENSOR_PO3130NC 5
+#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
+       u8 flags;
+#define FL_SAMSUNG 0x01                /* SamsungQ1 (2 sensors) */
+#define FL_HFLIP 0x02          /* mirrored by default */
+#define FL_VFLIP 0x04          /* vertical flipped by default */
 };
 
 /* V4L2 controls supported by the driver */
-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val);
-static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val);
+static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val);
+static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val);
 static int sd_setfreq(struct gspca_dev *gspca_dev, __s32 val);
 static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val);
+static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val);
 
 static struct ctrl sd_ctrls[] = {
-#define SD_AUTOGAIN 0
+/* next 2 controls work with some sensors only */
+#define HFLIP_IDX 0
        {
            {
-               .id      = V4L2_CID_AUTOGAIN,
+               .id      = V4L2_CID_HFLIP,
                .type    = V4L2_CTRL_TYPE_BOOLEAN,
-               .name    = "Auto Gain",
+               .name    = "Mirror",
                .minimum = 0,
                .maximum = 1,
                .step    = 1,
-               .default_value = 1,
+#define HFLIP_DEF 0
+               .default_value = HFLIP_DEF,
            },
-           .set = sd_setautogain,
-           .get = sd_getautogain,
+           .set = sd_sethflip,
+           .get = sd_gethflip,
        },
-#define SD_FREQ 1
+#define VFLIP_IDX 1
+       {
+           {
+               .id      = V4L2_CID_VFLIP,
+               .type    = V4L2_CTRL_TYPE_BOOLEAN,
+               .name    = "Vflip",
+               .minimum = 0,
+               .maximum = 1,
+               .step    = 1,
+#define VFLIP_DEF 0
+               .default_value = VFLIP_DEF,
+           },
+           .set = sd_setvflip,
+           .get = sd_getvflip,
+       },
+#define LIGHTFREQ_IDX 2
        {
            {
                .id      = V4L2_CID_POWER_LINE_FREQUENCY,
                .type    = V4L2_CTRL_TYPE_MENU,
                .name    = "Light frequency filter",
                .minimum = 0,
-               .maximum = 2,   /* 0: 0, 1: 50Hz, 2:60Hz */
+               .maximum = 2,   /* 0: No, 1: 50Hz, 2:60Hz */
                .step    = 1,
-               .default_value = 1,
+#define FREQ_DEF 1
+               .default_value = FREQ_DEF,
            },
            .set = sd_setfreq,
            .get = sd_getfreq,
        },
+/* po1200 only */
+#define SHARPNESS_IDX 3
+       {
+        {
+         .id = V4L2_CID_SHARPNESS,
+         .type = V4L2_CTRL_TYPE_INTEGER,
+         .name = "Sharpness",
+         .minimum = 0,
+         .maximum = 2,
+         .step = 1,
+#define SHARPNESS_DEF 1
+         .default_value = SHARPNESS_DEF,
+         },
+        .set = sd_setsharpness,
+        .get = sd_getsharpness,
+        },
+};
+
+static const struct v4l2_pix_format vc0321_mode[] = {
+       {320, 240, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
+               .bytesperline = 320,
+               .sizeimage = 320 * 240 * 2,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 1},
+       {640, 480, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
+               .bytesperline = 640,
+               .sizeimage = 640 * 480 * 2,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 0},
 };
+static const struct v4l2_pix_format vc0323_mode[] = {
+       {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
+               .bytesperline = 320,
+               .sizeimage = 320 * 240 * 3 / 8 + 590,
+               .colorspace = V4L2_COLORSPACE_JPEG,
+               .priv = 1},
+       {640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
+               .bytesperline = 640,
+               .sizeimage = 640 * 480 * 3 / 8 + 590,
+               .colorspace = V4L2_COLORSPACE_JPEG,
+               .priv = 0},
+       {1280, 960, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, /* mi1310_soc only */
+               .bytesperline = 1280,
+               .sizeimage = 1280 * 960 * 3 / 8 + 590,
+               .colorspace = V4L2_COLORSPACE_JPEG,
+               .priv = 2},
+};
+static const struct v4l2_pix_format bi_mode[] = {
+       {320, 240, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
+               .bytesperline = 320,
+               .sizeimage = 320 * 240 * 2,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 2},
+       {640, 480, V4L2_PIX_FMT_YUYV, V4L2_FIELD_NONE,
+               .bytesperline = 640,
+               .sizeimage = 640 * 480 * 2,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 1},
+       {1280, 1024, V4L2_PIX_FMT_YUYV, 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,
+               .sizeimage = 800 * 600 * 1 / 4 + 590,
+               .colorspace = V4L2_COLORSPACE_JPEG,
+               .priv = 0},
+};
+
+/* OV7660/7670 registers */
+#define OV7660_REG_MVFP 0x1e
+#define OV7660_MVFP_MIRROR     0x20
+#define OV7660_MVFP_VFLIP      0x10
 
-static struct cam_mode vc0321_mode[] = {
-       {V4L2_PIX_FMT_YUYV, 320, 240, 1},
-       {V4L2_PIX_FMT_YUYV, 640, 480, 0},
+static const u8 mi0360_matrix[9] = {
+       0x50, 0xf8, 0xf8, 0xf5, 0x50, 0xfb, 0xff, 0xf1, 0x50
 };
-static struct cam_mode vc0323_mode[] = {
-       {V4L2_PIX_FMT_JPEG, 320, 240, 1},
-       {V4L2_PIX_FMT_JPEG, 640, 480, 0},
+
+static const u8 mi0360_initVGA_JPG[][4] = {
+       {0xb0, 0x03, 0x19, 0xcc},
+       {0xb0, 0x04, 0x02, 0xcc},
+       {0xb3, 0x00, 0x24, 0xcc},
+       {0xb3, 0x00, 0x25, 0xcc},
+       {0xb3, 0x08, 0x01, 0xcc},
+       {0xb3, 0x09, 0x0c, 0xcc},
+       {0xb3, 0x05, 0x01, 0xcc},
+       {0xb3, 0x06, 0x03, 0xcc},
+       {0xb3, 0x03, 0x0a, 0xcc},
+       {0xb3, 0x20, 0x00, 0xcc},
+       {0xb3, 0x21, 0x00, 0xcc},
+       {0xb3, 0x22, 0x01, 0xcc},
+       {0xb3, 0x23, 0xe0, 0xcc},
+       {0xb3, 0x04, 0x05, 0xcc},
+       {0xb3, 0x14, 0x00, 0xcc},
+       {0xb3, 0x15, 0x00, 0xcc},
+       {0xb3, 0x16, 0x02, 0xcc},
+       {0xb3, 0x17, 0x7f, 0xcc},
+       {0xb3, 0x35, 0xdd, 0xcc},
+       {0xb3, 0x34, 0x02, 0xcc},
+       {0xb3, 0x00, 0x25, 0xcc},
+       {0xbc, 0x00, 0x71, 0xcc},
+       {0xb8, 0x00, 0x13, 0xcc},
+       {0xb8, 0x27, 0x20, 0xcc},
+       {0xb8, 0x2c, 0x50, 0xcc},
+       {0xb8, 0x2d, 0xf8, 0xcc},
+       {0xb8, 0x2e, 0xf8, 0xcc},
+       {0xb8, 0x2f, 0xf8, 0xcc},
+       {0xb8, 0x30, 0x50, 0xcc},
+       {0xb8, 0x31, 0xf8, 0xcc},
+       {0xb8, 0x32, 0xf8, 0xcc},
+       {0xb8, 0x33, 0xf8, 0xcc},
+       {0xb8, 0x34, 0x50, 0xcc},
+       {0xb8, 0x35, 0x00, 0xcc},
+       {0xb8, 0x36, 0x00, 0xcc},
+       {0xb8, 0x37, 0x00, 0xcc},
+       {0xb8, 0x01, 0x79, 0xcc},
+       {0xb8, 0x08, 0xe0, 0xcc},
+       {0xb3, 0x01, 0x41, 0xcc},
+       {0xb8, 0x01, 0x79, 0xcc},
+       {0xb8, 0x14, 0x18, 0xcc},
+       {0xb8, 0xb2, 0x0a, 0xcc},
+       {0xb8, 0xb4, 0x0a, 0xcc},
+       {0xb8, 0xb5, 0x0a, 0xcc},
+       {0xb8, 0xfe, 0x00, 0xcc},
+       {0xb8, 0xff, 0x28, 0xcc},
+       {0xb9, 0x00, 0x28, 0xcc},
+       {0xb9, 0x01, 0x28, 0xcc},
+       {0xb9, 0x02, 0x28, 0xcc},
+       {0xb9, 0x03, 0x00, 0xcc},
+       {0xb9, 0x04, 0x00, 0xcc},
+       {0xb9, 0x05, 0x3c, 0xcc},
+       {0xb9, 0x06, 0x3c, 0xcc},
+       {0xb9, 0x07, 0x3c, 0xcc},
+       {0xb9, 0x08, 0x3c, 0xcc},
+       {0xb8, 0x8e, 0x00, 0xcc},
+       {0xb8, 0x8f, 0xff, 0xcc},
+       {0xb8, 0x81, 0x09, 0xcc},
+       {0x31, 0x00, 0x00, 0xbb},
+       {0x09, 0x01, 0xc7, 0xbb},
+       {0x34, 0x01, 0x00, 0xbb},
+       {0x2b, 0x00, 0x28, 0xbb},
+       {0x2c, 0x00, 0x30, 0xbb},
+       {0x2d, 0x00, 0x30, 0xbb},
+       {0x2e, 0x00, 0x28, 0xbb},
+       {0x62, 0x04, 0x11, 0xbb},
+       {0x03, 0x01, 0xe0, 0xbb},
+       {0x2c, 0x00, 0x2c, 0xbb},
+       {0x20, 0xd0, 0x00, 0xbb},
+       {0x01, 0x00, 0x08, 0xbb},
+       {0x06, 0x00, 0x10, 0xbb},
+       {0x05, 0x00, 0x20, 0xbb},
+       {0x20, 0x00, 0x00, 0xbb},
+       {0xb6, 0x00, 0x00, 0xcc},
+       {0xb6, 0x03, 0x02, 0xcc},
+       {0xb6, 0x02, 0x80, 0xcc},
+       {0xb6, 0x05, 0x01, 0xcc},
+       {0xb6, 0x04, 0xe0, 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, 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},
+       {0xb6, 0x12, 0xf8, 0xcc},
+       {0xb8, 0x0c, 0x20, 0xcc},
+       {0xb8, 0x0d, 0x70, 0xcc},
+       {0xb6, 0x13, 0x13, 0xcc},
+       {0x35, 0x00, 0x60, 0xbb},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {}
+};
+static const u8 mi0360_initQVGA_JPG[][4] = {
+       {0xb0, 0x03, 0x19, 0xcc},
+       {0xb0, 0x04, 0x02, 0xcc},
+       {0xb3, 0x00, 0x24, 0xcc},
+       {0xb3, 0x00, 0x25, 0xcc},
+       {0xb3, 0x08, 0x01, 0xcc},
+       {0xb3, 0x09, 0x0c, 0xcc},
+       {0xb3, 0x05, 0x01, 0xcc},
+       {0xb3, 0x06, 0x03, 0xcc},
+       {0xb3, 0x03, 0x0a, 0xcc},
+       {0xb3, 0x20, 0x00, 0xcc},
+       {0xb3, 0x21, 0x00, 0xcc},
+       {0xb3, 0x22, 0x01, 0xcc},
+       {0xb3, 0x23, 0xe0, 0xcc},
+       {0xb3, 0x04, 0x05, 0xcc},
+       {0xb3, 0x14, 0x00, 0xcc},
+       {0xb3, 0x15, 0x00, 0xcc},
+       {0xb3, 0x16, 0x02, 0xcc},
+       {0xb3, 0x17, 0x7f, 0xcc},
+       {0xb3, 0x35, 0xdd, 0xcc},
+       {0xb3, 0x34, 0x02, 0xcc},
+       {0xb3, 0x00, 0x25, 0xcc},
+       {0xbc, 0x00, 0xd1, 0xcc},
+       {0xb8, 0x00, 0x13, 0xcc},
+       {0xb8, 0x27, 0x20, 0xcc},
+       {0xb8, 0x2c, 0x50, 0xcc},
+       {0xb8, 0x2d, 0xf8, 0xcc},
+       {0xb8, 0x2e, 0xf8, 0xcc},
+       {0xb8, 0x2f, 0xf8, 0xcc},
+       {0xb8, 0x30, 0x50, 0xcc},
+       {0xb8, 0x31, 0xf8, 0xcc},
+       {0xb8, 0x32, 0xf8, 0xcc},
+       {0xb8, 0x33, 0xf8, 0xcc},
+       {0xb8, 0x34, 0x50, 0xcc},
+       {0xb8, 0x35, 0x00, 0xcc},
+       {0xb8, 0x36, 0x00, 0xcc},
+       {0xb8, 0x37, 0x00, 0xcc},
+       {0xb8, 0x01, 0x79, 0xcc},
+       {0xb8, 0x08, 0xe0, 0xcc},
+       {0xb3, 0x01, 0x41, 0xcc},
+       {0xb8, 0x01, 0x79, 0xcc},
+       {0xb8, 0x14, 0x18, 0xcc},
+       {0xb8, 0xb2, 0x0a, 0xcc},
+       {0xb8, 0xb4, 0x0a, 0xcc},
+       {0xb8, 0xb5, 0x0a, 0xcc},
+       {0xb8, 0xfe, 0x00, 0xcc},
+       {0xb8, 0xff, 0x28, 0xcc},
+       {0xb9, 0x00, 0x28, 0xcc},
+       {0xb9, 0x01, 0x28, 0xcc},
+       {0xb9, 0x02, 0x28, 0xcc},
+       {0xb9, 0x03, 0x00, 0xcc},
+       {0xb9, 0x04, 0x00, 0xcc},
+       {0xb9, 0x05, 0x3c, 0xcc},
+       {0xb9, 0x06, 0x3c, 0xcc},
+       {0xb9, 0x07, 0x3c, 0xcc},
+       {0xb9, 0x08, 0x3c, 0xcc},
+       {0xb8, 0x8e, 0x00, 0xcc},
+       {0xb8, 0x8f, 0xff, 0xcc},
+       {0xb8, 0x81, 0x09, 0xcc},
+       {0x31, 0x00, 0x00, 0xbb},
+       {0x09, 0x01, 0xc7, 0xbb},
+       {0x34, 0x01, 0x00, 0xbb},
+       {0x2b, 0x00, 0x28, 0xbb},
+       {0x2c, 0x00, 0x30, 0xbb},
+       {0x2d, 0x00, 0x30, 0xbb},
+       {0x2e, 0x00, 0x28, 0xbb},
+       {0x62, 0x04, 0x11, 0xbb},
+       {0x03, 0x01, 0xe0, 0xbb},
+       {0x2c, 0x00, 0x2c, 0xbb},
+       {0x20, 0xd0, 0x00, 0xbb},
+       {0x01, 0x00, 0x08, 0xbb},
+       {0x06, 0x00, 0x10, 0xbb},
+       {0x05, 0x00, 0x20, 0xbb},
+       {0x20, 0x00, 0x00, 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},
+       {0xb6, 0x12, 0xf8, 0xcc},
+       {0xb6, 0x13, 0x13, 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},
+       {0xb8, 0x0c, 0x20, 0xcc},
+       {0xb8, 0x0d, 0x70, 0xcc},
+       {0xbc, 0x0b, 0x00, 0xcc},
+       {0xbc, 0x0c, 0x00, 0xcc},
+       {0x35, 0x00, 0xef, 0xbb},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {}
 };
 
-static const __u8 mi1310_socinitVGA_JPG[][4] = {
+static const u8 mi1310_socinitVGA_JPG[][4] = {
        {0xb0, 0x03, 0x19, 0xcc},
        {0xb0, 0x04, 0x02, 0xcc},
        {0xb3, 0x00, 0x64, 0xcc},
@@ -128,7 +456,7 @@ static const __u8 mi1310_socinitVGA_JPG[][4] = {
        {0x5b, 0x00, 0x01, 0xbb},
        {0x2f, 0xde, 0x20, 0xbb},
        {0xf0, 0x00, 0x00, 0xbb},
-       {0x20, 0x03, 0x02, 0xbb},
+       {0x20, 0x03, 0x02, 0xbb},       /* h/v flip */
        {0xf0, 0x00, 0x01, 0xbb},
        {0x05, 0x00, 0x07, 0xbb},
        {0x34, 0x00, 0x00, 0xbb},
@@ -249,7 +577,7 @@ static const __u8 mi1310_socinitVGA_JPG[][4] = {
        {0x03, 0x03, 0xc0, 0xbb},
        {},
 };
-static const __u8 mi1310_socinitQVGA_JPG[][4] = {
+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},
@@ -265,7 +593,8 @@ static const __u8 mi1310_socinitQVGA_JPG[][4] = {
        {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},
+       {0x20, 0x03, 0x02, 0xbb},       /* h/v flip */
+       {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},
@@ -322,15 +651,208 @@ static const __u8 mi1310_socinitQVGA_JPG[][4] = {
        {0x03, 0x03, 0xc0, 0xbb},
        {},
 };
+static const u8 mi1310_soc_InitSXGA_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, 0x0d, 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, 0x70, 0xcc},
+       {0xbc, 0x01, 0x01, 0xcc},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0xc8, 0x9f, 0x0b, 0xbb},
+       {0x5b, 0x00, 0x01, 0xbb},
+       {0xf0, 0x00, 0x00, 0xbb},
+       {0x20, 0x03, 0x02, 0xbb},       /* h/v flip */
+       {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, 0x60, 0xbb},
+       {0x21, 0xb6, 0x6e, 0xbb},
+       {0x37, 0x01, 0x40, 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},
+       {0xb6, 0x00, 0x00, 0xcc},
+       {0xb6, 0x03, 0x05, 0xcc},
+       {0xb6, 0x02, 0x00, 0xcc},
+       {0xb6, 0x05, 0x03, 0xcc},
+       {0xb6, 0x04, 0xc0, 0xcc},
+       {0xb6, 0x12, 0xf8, 0xcc},
+       {0xb6, 0x13, 0x29, 0xcc},
+       {0xb6, 0x18, 0x09, 0xcc},
+       {0xb6, 0x17, 0x60, 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, 0x01, 0x41, 0xcc},
+       {0x00, 0x00, 0x80, 0xdd},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x00, 0x00, 0x10, 0xdd},
+       {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},
+       {0x00, 0x00, 0x20, 0xdd},
+       {0x06, 0xf0, 0x8e, 0xbb},
+       {0x00, 0x00, 0x80, 0xdd},
+       {0x06, 0x70, 0x8e, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x00, 0x00, 0x20, 0xdd},
+       {0x5e, 0x6a, 0x53, 0xbb},
+       {0x5f, 0x40, 0x2c, 0xbb},
+       {0xf0, 0x00, 0x01, 0xbb},
+       {0x00, 0x00, 0x20, 0xdd},
+       {0x58, 0x00, 0x00, 0xbb},
+       {0x53, 0x09, 0x03, 0xbb},
+       {0x54, 0x31, 0x18, 0xbb},
+       {0x55, 0x8b, 0x5f, 0xbb},
+       {0x56, 0xc0, 0xa9, 0xbb},
+       {0x57, 0xe0, 0xd2, 0xbb},
+       {0xe1, 0x00, 0x00, 0xbb},
+       {0xdc, 0x09, 0x03, 0xbb},
+       {0xdd, 0x31, 0x18, 0xbb},
+       {0xde, 0x8b, 0x5f, 0xbb},
+       {0xdf, 0xc0, 0xa9, 0xbb},
+       {0xe0, 0xe0, 0xd2, 0xbb},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {0xf0, 0x00, 0x01, 0xbb},
+       {0x06, 0xf0, 0x8e, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x2f, 0xde, 0x20, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x24, 0x50, 0x20, 0xbb},
+       {0xbc, 0x0e, 0x00, 0xcc},
+       {0xbc, 0x0f, 0x05, 0xcc},
+       {0xbc, 0x10, 0xc0, 0xcc},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x34, 0x0c, 0x50, 0xbb},
+       {0xbc, 0x11, 0x03, 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, 0x00, 0xbb},
+       {0x03, 0x03, 0xc0, 0xbb},
+       {}
+};
 
-static const __u8 mi1320_gamma[17] = {
+static const u8 mi1320_gamma[17] = {
        0x00, 0x13, 0x38, 0x59, 0x79, 0x92, 0xa7, 0xb9, 0xc8,
        0xd4, 0xdf, 0xe7, 0xee, 0xf4, 0xf9, 0xfc, 0xff
 };
-static const __u8 mi1320_matrix[9] = {
+static const u8 mi1320_matrix[9] = {
        0x54, 0xda, 0x06, 0xf1, 0x50, 0xf4, 0xf7, 0xea, 0x52
 };
-static const __u8 mi1320_initVGA_data[][4] = {
+static const u8 mi1320_initVGA_data[][4] = {
        {0xb3, 0x01, 0x01, 0xcc},       {0x00, 0x00, 0x33, 0xdd},
        {0xb0, 0x03, 0x19, 0xcc},       {0x00, 0x00, 0x33, 0xdd},
        {0xb0, 0x04, 0x02, 0xcc},       {0x00, 0x00, 0x33, 0xdd},
@@ -409,7 +931,7 @@ static const __u8 mi1320_initVGA_data[][4] = {
        {0xb3, 0x5c, 0x01, 0xcc},       {0xb3, 0x01, 0x41, 0xcc},
        {}
 };
-static const __u8 mi1320_initQVGA_data[][4] = {
+static const u8 mi1320_initQVGA_data[][4] = {
        {0xb3, 0x01, 0x01, 0xcc},       {0x00, 0x00, 0x33, 0xdd},
        {0xb0, 0x03, 0x19, 0xcc},       {0x00, 0x00, 0x33, 0xdd},
        {0xb0, 0x04, 0x02, 0xcc},       {0x00, 0x00, 0x33, 0xdd},
@@ -478,15 +1000,354 @@ static const __u8 mi1320_initQVGA_data[][4] = {
        {}
 };
 
-static const __u8 po3130_gamma[17] = {
+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},       /* h/v flip */
+       {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},       /* h/v flip */
+       {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},       /* h/v flip */
+       {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},       /* h/v flip */
+       {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},       /* h/v flip */
+       {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},       /* h/v flip */
+       {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},       /* h/v flip */
+       {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
 };
-static const __u8 po3130_matrix[9] = {
+static const u8 po3130_matrix[9] = {
        0x5f, 0xec, 0xf5, 0xf1, 0x5a, 0xf5, 0xf1, 0xec, 0x63
 };
 
-static const __u8 po3130_initVGA_data[][4] = {
+static const u8 po3130_initVGA_data[][4] = {
        {0xb0, 0x4d, 0x00, 0xcc},       {0xb3, 0x01, 0x01, 0xcc},
        {0x00, 0x00, 0x50, 0xdd},       {0xb0, 0x03, 0x01, 0xcc},
        {0xb3, 0x00, 0x04, 0xcc},       {0xb3, 0x00, 0x24, 0xcc},
@@ -569,7 +1430,7 @@ static const __u8 po3130_initVGA_data[][4] = {
        {0xb3, 0x5c, 0x00, 0xcc},       {0xb3, 0x01, 0x41, 0xcc},
        {}
 };
-static const __u8 po3130_rundata[][4] = {
+static const u8 po3130_rundata[][4] = {
        {0x00, 0x47, 0x45, 0xaa},       {0x00, 0x48, 0x9b, 0xaa},
        {0x00, 0x49, 0x3a, 0xaa},       {0x00, 0x4a, 0x01, 0xaa},
        {0x00, 0x44, 0x40, 0xaa},
@@ -584,7 +1445,7 @@ static const __u8 po3130_rundata[][4] = {
        {}
 };
 
-static const __u8 po3130_initQVGA_data[][4] = {
+static const u8 po3130_initQVGA_data[][4] = {
        {0xb0, 0x4d, 0x00, 0xcc},       {0xb3, 0x01, 0x01, 0xcc},
        {0x00, 0x00, 0x50, 0xdd},       {0xb0, 0x03, 0x09, 0xcc},
        {0xb3, 0x00, 0x04, 0xcc},       {0xb3, 0x00, 0x24, 0xcc},
@@ -670,121 +1531,207 @@ static const __u8 po3130_initQVGA_data[][4] = {
        {}
 };
 
-static const __u8 hv7131r_gamma[17] = {
-/*     0x00, 0x13, 0x38, 0x59, 0x79, 0x92, 0xa7, 0xb9, 0xc8,
- *     0xd4, 0xdf, 0xe7, 0xee, 0xf4, 0xf9, 0xfc, 0xff */
-       0x04, 0x1a, 0x36, 0x55, 0x6f, 0x87, 0x9d, 0xb0, 0xc1,
-       0xcf, 0xda, 0xe4, 0xec, 0xf3, 0xf8, 0xfd, 0xff
+static const u8 hv7131r_gamma[17] = {
+       0x00, 0x13, 0x38, 0x59, 0x79, 0x92, 0xa7, 0xb9, 0xc8,
+       0xd4, 0xdf, 0xe7, 0xee, 0xf4, 0xf9, 0xfc, 0xff
 };
-static const __u8 hv7131r_matrix[9] = {
+static const u8 hv7131r_matrix[9] = {
        0x5f, 0xec, 0xf5, 0xf1, 0x5a, 0xf5, 0xf1, 0xec, 0x63
 };
-static const __u8 hv7131r_initVGA_data[][4] = {
-       {0xb0, 0x4d, 0x00, 0xcc},       {0xb3, 0x01, 0x01, 0xcc},
-       {0x00, 0x00, 0x50, 0xdd},       {0xb0, 0x03, 0x01, 0xcc},
+static const u8 hv7131r_initVGA_data[][4] = {
+       {0xb3, 0x01, 0x01, 0xcc},
+       {0xb0, 0x03, 0x19, 0xcc},
+       {0xb0, 0x04, 0x02, 0xcc},
+       {0x00, 0x00, 0x20, 0xdd},
        {0xb3, 0x00, 0x24, 0xcc},
-       {0xb3, 0x00, 0x25, 0xcc},       {0xb3, 0x08, 0x01, 0xcc},
-       {0xb3, 0x09, 0x0c, 0xcc},       {0xb3, 0x05, 0x00, 0xcc},
-       {0xb3, 0x06, 0x01, 0xcc},
-       {0xb3, 0x01, 0x45, 0xcc},       {0xb3, 0x03, 0x0b, 0xcc},
-       {0xb3, 0x04, 0x05, 0xcc},       {0xb3, 0x20, 0x00, 0xcc},
+       {0xb3, 0x00, 0x25, 0xcc},
+       {0xb3, 0x08, 0x01, 0xcc},
+       {0xb3, 0x09, 0x0c, 0xcc},
+       {0xb3, 0x05, 0x01, 0xcc},
+       {0xb3, 0x06, 0x03, 0xcc},
+       {0xb3, 0x01, 0x45, 0xcc},
+       {0xb3, 0x03, 0x0b, 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, 0x22, 0x01, 0xcc},
+       {0xb3, 0x23, 0xe0, 0xcc},
+       {0xb3, 0x14, 0x00, 0xcc},
+       {0xb3, 0x15, 0x02, 0xcc},
        {0xb3, 0x16, 0x02, 0xcc},
-       {0xb3, 0x17, 0x7f, 0xcc},       {0xb3, 0x34, 0x01, 0xcc},
-       {0xb3, 0x35, 0x91, 0xcc},       {0xb3, 0x00, 0x27, 0xcc},
+       {0xb3, 0x17, 0x7f, 0xcc},
+       {0xb3, 0x34, 0x01, 0xcc},
+       {0xb3, 0x35, 0x91, 0xcc},
+       {0xb3, 0x00, 0x27, 0xcc},
        {0xbc, 0x00, 0x73, 0xcc},
-       {0xb8, 0x00, 0x23, 0xcc},       {0x00, 0x01, 0x0c, 0xaa},
-       {0x00, 0x14, 0x01, 0xaa},       {0x00, 0x15, 0xe6, 0xaa},
-       {0x00, 0x16, 0x02, 0xaa},
-       {0x00, 0x17, 0x86, 0xaa},       {0x00, 0x23, 0x00, 0xaa},
-       {0x00, 0x25, 0x09, 0xaa},       {0x00, 0x26, 0x27, 0xaa},
-       {0x00, 0x27, 0xc0, 0xaa},
-       {0xb8, 0x2c, 0x60, 0xcc},       {0xb8, 0x2d, 0xf8, 0xcc},
-       {0xb8, 0x2e, 0xf8, 0xcc},       {0xb8, 0x2f, 0xf8, 0xcc},
+       {0xb8, 0x00, 0x23, 0xcc},
+       {0xb8, 0x2c, 0x50, 0xcc},
+       {0xb8, 0x2d, 0xf8, 0xcc},
+       {0xb8, 0x2e, 0xf8, 0xcc},
+       {0xb8, 0x2f, 0xf8, 0xcc},
        {0xb8, 0x30, 0x50, 0xcc},
-       {0xb8, 0x31, 0xf8, 0xcc},       {0xb8, 0x32, 0xf8, 0xcc},
-       {0xb8, 0x33, 0xf8, 0xcc},       {0xb8, 0x34, 0x65, 0xcc},
+       {0xb8, 0x31, 0xf8, 0xcc},
+       {0xb8, 0x32, 0xf8, 0xcc},
+       {0xb8, 0x33, 0xf8, 0xcc},
+       {0xb8, 0x34, 0x58, 0xcc},
        {0xb8, 0x35, 0x00, 0xcc},
-       {0xb8, 0x36, 0x00, 0xcc},       {0xb8, 0x37, 0x00, 0xcc},
-       {0xb8, 0x27, 0x20, 0xcc},       {0xb8, 0x01, 0x7d, 0xcc},
+       {0xb8, 0x36, 0x00, 0xcc},
+       {0xb8, 0x37, 0x00, 0xcc},
+       {0xb8, 0x27, 0x20, 0xcc},
+       {0xb8, 0x01, 0x7d, 0xcc},
        {0xb8, 0x81, 0x09, 0xcc},
-       {0xb3, 0x01, 0x41, 0xcc},       {0xb8, 0xfe, 0x00, 0xcc},
-       {0xb8, 0xff, 0x28, 0xcc},       {0xb9, 0x00, 0x28, 0xcc},
-       {0xb9, 0x01, 0x28, 0xcc},
-       {0xb9, 0x02, 0x28, 0xcc},       {0xb9, 0x03, 0x00, 0xcc},
-       {0xb9, 0x04, 0x00, 0xcc},       {0xb9, 0x05, 0x3c, 0xcc},
-       {0xb9, 0x06, 0x3c, 0xcc},
-       {0xb9, 0x07, 0x3c, 0xcc},       {0xb9, 0x08, 0x3c, 0xcc},
-       {0xb8, 0x8e, 0x00, 0xcc},       {0xb8, 0x8f, 0xff, 0xcc},
+       {0xb3, 0x01, 0x41, 0xcc},
+       {0xb8, 0x8e, 0x00, 0xcc},
+       {0xb8, 0x8f, 0xff, 0xcc},
+       {0x00, 0x01, 0x0c, 0xaa},
+       {0x00, 0x14, 0x01, 0xaa},
+       {0x00, 0x15, 0xe6, 0xaa},
+       {0x00, 0x16, 0x02, 0xaa},
+       {0x00, 0x17, 0x86, 0xaa},
+       {0x00, 0x23, 0x00, 0xaa},
+       {0x00, 0x25, 0x03, 0xaa},
+       {0x00, 0x26, 0xa9, 0xaa},
+       {0x00, 0x27, 0x80, 0xaa},
        {0x00, 0x30, 0x18, 0xaa},
+       {0xb6, 0x00, 0x00, 0xcc},
+       {0xb6, 0x03, 0x02, 0xcc},
+       {0xb6, 0x02, 0x80, 0xcc},
+       {0xb6, 0x05, 0x01, 0xcc},
+       {0xb6, 0x04, 0xe0, 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, 0x10, 0xcc},
+       {0xb6, 0x12, 0xf8, 0xcc},
+       {0xb6, 0x13, 0x13, 0xcc},
+       {0xb9, 0x12, 0x00, 0xcc},
+       {0xb9, 0x13, 0x0a, 0xcc},
+       {0xb9, 0x14, 0x0a, 0xcc},
+       {0xb9, 0x15, 0x0a, 0xcc},
+       {0xb9, 0x16, 0x0a, 0xcc},
+       {0xb8, 0x0c, 0x20, 0xcc},
+       {0xb8, 0x0d, 0x70, 0xcc},
+       {0xb9, 0x18, 0x00, 0xcc},
+       {0xb9, 0x19, 0x0f, 0xcc},
+       {0xb9, 0x1a, 0x0f, 0xcc},
+       {0xb9, 0x1b, 0x0f, 0xcc},
+       {0xb9, 0x1c, 0x0f, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},
        {}
 };
 
-static const __u8 hv7131r_initQVGA_data[][4] = {
-       {0xb0, 0x4d, 0x00, 0xcc},       {0xb3, 0x01, 0x01, 0xcc},
-       {0x00, 0x00, 0x50, 0xdd},       {0xb0, 0x03, 0x01, 0xcc},
+static const u8 hv7131r_initQVGA_data[][4] = {
+       {0xb3, 0x01, 0x01, 0xcc},
+       {0xb0, 0x03, 0x19, 0xcc},
+       {0xb0, 0x04, 0x02, 0xcc},
+       {0x00, 0x00, 0x20, 0xdd},
        {0xb3, 0x00, 0x24, 0xcc},
-       {0xb3, 0x00, 0x25, 0xcc},       {0xb3, 0x08, 0x01, 0xcc},
-       {0xb3, 0x09, 0x0c, 0xcc},       {0xb3, 0x05, 0x00, 0xcc},
-       {0xb3, 0x06, 0x01, 0xcc},
-       {0xb3, 0x03, 0x0b, 0xcc},       {0xb3, 0x04, 0x05, 0xcc},
-       {0xb3, 0x20, 0x00, 0xcc},       {0xb3, 0x21, 0x00, 0xcc},
+       {0xb3, 0x00, 0x25, 0xcc},
+       {0xb3, 0x08, 0x01, 0xcc},
+       {0xb3, 0x09, 0x0c, 0xcc},
+       {0xb3, 0x05, 0x01, 0xcc},
+       {0xb3, 0x06, 0x03, 0xcc},
+       {0xb3, 0x01, 0x45, 0xcc},
+       {0xb3, 0x03, 0x0b, 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, 0x23, 0xe0, 0xcc},
+       {0xb3, 0x14, 0x00, 0xcc},
+       {0xb3, 0x15, 0x02, 0xcc},
+       {0xb3, 0x16, 0x02, 0xcc},
        {0xb3, 0x17, 0x7f, 0xcc},
-       {0xb3, 0x34, 0x01, 0xcc},       {0xb3, 0x35, 0x91, 0xcc},
-       {0xb3, 0x00, 0x27, 0xcc},       {0xbc, 0x00, 0xd1, 0xcc},
-       {0xb8, 0x00, 0x21, 0xcc},
-       {0x00, 0x01, 0x0c, 0xaa},       {0x00, 0x14, 0x01, 0xaa},
-       {0x00, 0x15, 0xe6, 0xaa},       {0x00, 0x16, 0x02, 0xaa},
-       {0x00, 0x17, 0x86, 0xaa},
-       {0x00, 0x23, 0x00, 0xaa},       {0x00, 0x25, 0x01, 0xaa},
-       {0x00, 0x26, 0xd4, 0xaa},       {0x00, 0x27, 0xc0, 0xaa},
-       {0xbc, 0x02, 0x08, 0xcc},
-       {0xbc, 0x03, 0x70, 0xcc},       {0xbc, 0x04, 0x08, 0xcc},
-       {0xbc, 0x05, 0x00, 0xcc},       {0xbc, 0x06, 0x00, 0xcc},
-       {0xbc, 0x08, 0x3c, 0xcc},
-       {0xbc, 0x09, 0x40, 0xcc},       {0xbc, 0x0a, 0x04, 0xcc},
-       {0xbc, 0x0b, 0x00, 0xcc},       {0xbc, 0x0c, 0x00, 0xcc},
-       {0xb8, 0xfe, 0x02, 0xcc},
-       {0xb8, 0xff, 0x07, 0xcc},       {0xb9, 0x00, 0x14, 0xcc},
-       {0xb9, 0x01, 0x14, 0xcc},       {0xb9, 0x02, 0x14, 0xcc},
-       {0xb9, 0x03, 0x00, 0xcc},
-       {0xb9, 0x04, 0x02, 0xcc},       {0xb9, 0x05, 0x05, 0xcc},
-       {0xb9, 0x06, 0x0f, 0xcc},       {0xb9, 0x07, 0x0f, 0xcc},
-       {0xb9, 0x08, 0x0f, 0xcc},
-       {0xb8, 0x2c, 0x60, 0xcc},       {0xb8, 0x2d, 0xf8, 0xcc},
-       {0xb8, 0x2e, 0xf8, 0xcc},       {0xb8, 0x2f, 0xf8, 0xcc},
+       {0xb3, 0x34, 0x01, 0xcc},
+       {0xb3, 0x35, 0x91, 0xcc},
+       {0xb3, 0x00, 0x27, 0xcc},
+       {0xbc, 0x00, 0xd3, 0xcc},
+       {0xb8, 0x00, 0x23, 0xcc},
+       {0xb8, 0x2c, 0x50, 0xcc},
+       {0xb8, 0x2d, 0xf8, 0xcc},
+       {0xb8, 0x2e, 0xf8, 0xcc},
+       {0xb8, 0x2f, 0xf8, 0xcc},
        {0xb8, 0x30, 0x50, 0xcc},
-       {0xb8, 0x31, 0xf8, 0xcc},       {0xb8, 0x32, 0xf8, 0xcc},
+       {0xb8, 0x31, 0xf8, 0xcc},
+       {0xb8, 0x32, 0xf8, 0xcc},
        {0xb8, 0x33, 0xf8, 0xcc},
-       {0xb8, 0x34, 0x65, 0xcc},       {0xb8, 0x35, 0x00, 0xcc},
-       {0xb8, 0x36, 0x00, 0xcc},       {0xb8, 0x37, 0x00, 0xcc},
+       {0xb8, 0x34, 0x58, 0xcc},
+       {0xb8, 0x35, 0x00, 0xcc},
+       {0xb8, 0x36, 0x00, 0xcc},
+       {0xb8, 0x37, 0x00, 0xcc},
        {0xb8, 0x27, 0x20, 0xcc},
-       {0xb8, 0x01, 0x7d, 0xcc},       {0xb8, 0x81, 0x09, 0xcc},
-       {0xb3, 0x01, 0x41, 0xcc},       {0xb8, 0xfe, 0x00, 0xcc},
-       {0xb8, 0xff, 0x28, 0xcc},
-       {0xb9, 0x00, 0x28, 0xcc},       {0xb9, 0x01, 0x28, 0xcc},
-       {0xb9, 0x02, 0x28, 0xcc},       {0xb9, 0x03, 0x00, 0xcc},
-       {0xb9, 0x04, 0x00, 0xcc},
-       {0xb9, 0x05, 0x3c, 0xcc},       {0xb9, 0x06, 0x3c, 0xcc},
-       {0xb9, 0x07, 0x3c, 0xcc},       {0xb9, 0x08, 0x3c, 0xcc},
+       {0xb8, 0x01, 0x7d, 0xcc},
+       {0xb8, 0x81, 0x09, 0xcc},
+       {0xb3, 0x01, 0x41, 0xcc},
        {0xb8, 0x8e, 0x00, 0xcc},
-       {0xb8, 0x8f, 0xff, 0xcc},       {0x00, 0x30, 0x18, 0xaa},
+       {0xb8, 0x8f, 0xff, 0xcc},
+       {0x00, 0x01, 0x0c, 0xaa},
+       {0x00, 0x14, 0x01, 0xaa},
+       {0x00, 0x15, 0xe6, 0xaa},
+       {0x00, 0x16, 0x02, 0xaa},
+       {0x00, 0x17, 0x86, 0xaa},
+       {0x00, 0x23, 0x00, 0xaa},
+       {0x00, 0x25, 0x03, 0xaa},
+       {0x00, 0x26, 0xa9, 0xaa},
+       {0x00, 0x27, 0x80, 0xaa},
+       {0x00, 0x30, 0x18, 0xaa},
+       {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},
+       {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},
+       {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},
+       {0xb8, 0x0c, 0x20, 0xcc},
+       {0xb8, 0x0d, 0x70, 0xcc},
+       {0xb9, 0x1a, 0x0f, 0xcc},
+       {0xb9, 0x1b, 0x0f, 0xcc},
+       {0xb9, 0x1c, 0x0f, 0xcc},
+       {0xb6, 0x12, 0xf8, 0xcc},
+       {0xb6, 0x13, 0x13, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},
        {}
 };
 
-static const __u8 ov7660_gamma[17] = {
+static const u8 ov7660_gamma[17] = {
        0x00, 0x13, 0x38, 0x59, 0x79, 0x92, 0xa7, 0xb9, 0xc8,
        0xd4, 0xdf, 0xe7, 0xee, 0xf4, 0xf9, 0xfc, 0xff
 };
-static const __u8 ov7660_matrix[9] = {
+static const u8 ov7660_matrix[9] = {
        0x5a, 0xf0, 0xf6, 0xf3, 0x57, 0xf6, 0xf3, 0xef, 0x62
 };
-static const __u8 ov7660_initVGA_data[][4] = {
+static const u8 ov7660_initVGA_data[][4] = {
        {0xb0, 0x4d, 0x00, 0xcc},       {0xb3, 0x01, 0x01, 0xcc},
        {0x00, 0x00, 0x50, 0xdd},
        {0xb0, 0x03, 0x01, 0xcc},
@@ -809,7 +1756,7 @@ static const __u8 ov7660_initVGA_data[][4] = {
        {0x00, 0x01, 0x80, 0xaa},       {0x00, 0x02, 0x80, 0xaa},
        {0x00, 0x12, 0x80, 0xaa},
        {0x00, 0x12, 0x05, 0xaa},
-       {0x00, 0x1e, 0x01, 0xaa},
+       {0x00, 0x1e, 0x01, 0xaa},       /* MVFP */
        {0x00, 0x3d, 0x40, 0xaa}, /* 0x3d <-40 gamma 01 */
        {0x00, 0x41, 0x00, 0xaa}, /* edge 00 */
        {0x00, 0x0d, 0x48, 0xaa},       {0x00, 0x0e, 0x04, 0xaa},
@@ -842,7 +1789,7 @@ static const __u8 ov7660_initVGA_data[][4] = {
        {0x00, 0x29, 0x3c, 0xaa},       {0xb3, 0x01, 0x45, 0xcc},
        {}
 };
-static const __u8 ov7660_initQVGA_data[][4] = {
+static const u8 ov7660_initQVGA_data[][4] = {
        {0xb0, 0x4d, 0x00, 0xcc},       {0xb3, 0x01, 0x01, 0xcc},
        {0x00, 0x00, 0x50, 0xdd},       {0xb0, 0x03, 0x01, 0xcc},
        {0xb3, 0x00, 0x21, 0xcc},       {0xb3, 0x00, 0x26, 0xcc},
@@ -863,7 +1810,7 @@ static const __u8 ov7660_initQVGA_data[][4] = {
        {0xb8, 0x27, 0x20, 0xcc},       {0xb8, 0x8f, 0x50, 0xcc},
        {0x00, 0x01, 0x80, 0xaa},       {0x00, 0x02, 0x80, 0xaa},
        {0x00, 0x12, 0x80, 0xaa},       {0x00, 0x12, 0x05, 0xaa},
-       {0x00, 0x1e, 0x01, 0xaa},
+       {0x00, 0x1e, 0x01, 0xaa},       /* MVFP */
        {0x00, 0x3d, 0x40, 0xaa}, /* 0x3d <-40 gamma 01 */
        {0x00, 0x41, 0x00, 0xaa}, /* edge 00 */
        {0x00, 0x0d, 0x48, 0xaa},       {0x00, 0x0e, 0x04, 0xaa},
@@ -908,29 +1855,29 @@ static const __u8 ov7660_initQVGA_data[][4] = {
        {0xb8, 0x8f, 0xff, 0xcc}, /* ff */
        {0x00, 0x29, 0x3c, 0xaa},
        {0xb3, 0x01, 0x45, 0xcc}, /* 45 */
-       {0x00, 0x00, 0x00, 0x00}
+       {}
 };
 
-static const __u8 ov7660_50HZ[][4] = {
+static const u8 ov7660_50HZ[][4] = {
        {0x00, 0x3b, 0x08, 0xaa},
        {0x00, 0x9d, 0x40, 0xaa},
        {0x00, 0x13, 0xa7, 0xaa},
-       {0x00, 0x00, 0x00, 0x00}
+       {}
 };
 
-static const __u8 ov7660_60HZ[][4] = {
+static const u8 ov7660_60HZ[][4] = {
        {0x00, 0x3b, 0x00, 0xaa},
        {0x00, 0x9e, 0x40, 0xaa},
        {0x00, 0x13, 0xa7, 0xaa},
        {}
 };
 
-static const __u8 ov7660_NoFliker[][4] = {
+static const u8 ov7660_NoFliker[][4] = {
        {0x00, 0x13, 0x87, 0xaa},
        {}
 };
 
-static const __u8 ov7670_initVGA_JPG[][4] = {
+static const u8 ov7670_initVGA_JPG[][4] = {
        {0xb3, 0x01, 0x05, 0xcc},
        {0x00, 0x00, 0x30, 0xdd},       {0xb0, 0x03, 0x19, 0xcc},
        {0x00, 0x00, 0x10, 0xdd},
@@ -969,7 +1916,8 @@ static const __u8 ov7670_initVGA_JPG[][4] = {
        {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},       {0x00, 0x21, 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},
@@ -1034,7 +1982,8 @@ static const __u8 ov7670_initVGA_JPG[][4] = {
        {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},       {0x00, 0xaa, 0x14, 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},
@@ -1058,7 +2007,7 @@ static const __u8 ov7670_initVGA_JPG[][4] = {
        {},
 };
 
-static const __u8 ov7670_initQVGA_JPG[][4] = {
+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},
@@ -1096,7 +2045,8 @@ static const __u8 ov7670_initQVGA_JPG[][4] = {
        {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},       {0x00, 0x21, 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},
@@ -1161,7 +2111,8 @@ static const __u8 ov7670_initQVGA_JPG[][4] = {
        {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},       {0x00, 0xaa, 0x14, 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},
@@ -1190,44 +2141,334 @@ static const __u8 ov7670_initQVGA_JPG[][4] = {
        {},
 };
 
+/* PO1200 - values from usbvm326.inf and ms-win trace */
+static const u8 po1200_gamma[17] = {
+       0x00, 0x13, 0x38, 0x59, 0x79, 0x92, 0xa7, 0xb9, 0xc8,
+       0xd4, 0xdf, 0xe7, 0xee, 0xf4, 0xf9, 0xfc, 0xff
+};
+static const u8 po1200_matrix[9] = {
+       0x60, 0xf9, 0xe5, 0xe7, 0x50, 0x05, 0xf3, 0xe6, 0x5e
+};
+static const u8 po1200_initVGA_data[][4] = {
+       {0xb0, 0x03, 0x19, 0xcc},       /* reset? */
+       {0xb0, 0x03, 0x19, 0xcc},
+/*     {0x00, 0x00, 0x33, 0xdd}, */
+       {0xb0, 0x04, 0x02, 0xcc},
+       {0xb0, 0x02, 0x02, 0xcc},
+       {0xb3, 0x5d, 0x00, 0xcc},
+       {0xb3, 0x01, 0x01, 0xcc},
+       {0xb3, 0x00, 0x64, 0xcc},
+       {0xb3, 0x00, 0x65, 0xcc},
+       {0xb3, 0x05, 0x01, 0xcc},
+       {0xb3, 0x06, 0x01, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {0xb3, 0x08, 0x01, 0xcc},
+       {0xb3, 0x09, 0x0c, 0xcc},
+       {0xb3, 0x00, 0x67, 0xcc},
+       {0xb3, 0x02, 0xb2, 0xcc},
+       {0xb3, 0x03, 0x18, 0xcc},
+       {0xb3, 0x04, 0x15, 0xcc},
+       {0xb3, 0x20, 0x00, 0xcc},
+       {0xb3, 0x21, 0x00, 0xcc},
+       {0xb3, 0x22, 0x02, 0xcc},
+       {0xb3, 0x23, 0x58, 0xcc},
+       {0xb3, 0x14, 0x00, 0xcc},
+       {0xb3, 0x15, 0x00, 0xcc},
+       {0xb3, 0x16, 0x03, 0xcc},
+       {0xb3, 0x17, 0x1f, 0xcc},
+       {0xbc, 0x00, 0x71, 0xcc},
+       {0xbc, 0x01, 0x01, 0xcc},
+       {0xb0, 0x54, 0x13, 0xcc},
+       {0xb3, 0x00, 0x67, 0xcc},
+       {0xb3, 0x34, 0x01, 0xcc},
+       {0xb3, 0x35, 0xdc, 0xcc},
+       {0x00, 0x03, 0x00, 0xaa},
+       {0x00, 0x12, 0x05, 0xaa},
+       {0x00, 0x13, 0x02, 0xaa},
+       {0x00, 0x1e, 0xc6, 0xaa},       /* h/v flip */
+       {0x00, 0x21, 0x00, 0xaa},
+       {0x00, 0x25, 0x02, 0xaa},
+       {0x00, 0x3c, 0x4f, 0xaa},
+       {0x00, 0x3f, 0xe0, 0xaa},
+       {0x00, 0x42, 0xff, 0xaa},
+       {0x00, 0x45, 0x34, 0xaa},
+       {0x00, 0x55, 0xfe, 0xaa},
+       {0x00, 0x59, 0xd3, 0xaa},
+       {0x00, 0x5e, 0x04, 0xaa},
+       {0x00, 0x61, 0xb8, 0xaa},       /* sharpness */
+       {0x00, 0x62, 0x02, 0xaa},
+       {0x00, 0xa7, 0x31, 0xaa},
+       {0x00, 0xa9, 0x66, 0xaa},
+       {0x00, 0xb0, 0x00, 0xaa},
+       {0x00, 0xb1, 0x00, 0xaa},
+       {0x00, 0xb3, 0x11, 0xaa},
+       {0x00, 0xb6, 0x26, 0xaa},
+       {0x00, 0xb7, 0x20, 0xaa},
+       {0x00, 0xba, 0x04, 0xaa},
+       {0x00, 0x88, 0x42, 0xaa},
+       {0x00, 0x89, 0x9a, 0xaa},
+       {0x00, 0x8a, 0x88, 0xaa},
+       {0x00, 0x8b, 0x8e, 0xaa},
+       {0x00, 0x8c, 0x3e, 0xaa},
+       {0x00, 0x8d, 0x90, 0xaa},
+       {0x00, 0x8e, 0x87, 0xaa},
+       {0x00, 0x8f, 0x96, 0xaa},
+       {0x00, 0x90, 0x3d, 0xaa},
+       {0x00, 0x64, 0x00, 0xaa},
+       {0x00, 0x65, 0x10, 0xaa},
+       {0x00, 0x66, 0x20, 0xaa},
+       {0x00, 0x67, 0x2b, 0xaa},
+       {0x00, 0x68, 0x36, 0xaa},
+       {0x00, 0x69, 0x49, 0xaa},
+       {0x00, 0x6a, 0x5a, 0xaa},
+       {0x00, 0x6b, 0x7f, 0xaa},
+       {0x00, 0x6c, 0x9b, 0xaa},
+       {0x00, 0x6d, 0xba, 0xaa},
+       {0x00, 0x6e, 0xd4, 0xaa},
+       {0x00, 0x6f, 0xea, 0xaa},
+       {0x00, 0x70, 0x00, 0xaa},
+       {0x00, 0x71, 0x10, 0xaa},
+       {0x00, 0x72, 0x20, 0xaa},
+       {0x00, 0x73, 0x2b, 0xaa},
+       {0x00, 0x74, 0x36, 0xaa},
+       {0x00, 0x75, 0x49, 0xaa},
+       {0x00, 0x76, 0x5a, 0xaa},
+       {0x00, 0x77, 0x7f, 0xaa},
+       {0x00, 0x78, 0x9b, 0xaa},
+       {0x00, 0x79, 0xba, 0xaa},
+       {0x00, 0x7a, 0xd4, 0xaa},
+       {0x00, 0x7b, 0xea, 0xaa},
+       {0x00, 0x7c, 0x00, 0xaa},
+       {0x00, 0x7d, 0x10, 0xaa},
+       {0x00, 0x7e, 0x20, 0xaa},
+       {0x00, 0x7f, 0x2b, 0xaa},
+       {0x00, 0x80, 0x36, 0xaa},
+       {0x00, 0x81, 0x49, 0xaa},
+       {0x00, 0x82, 0x5a, 0xaa},
+       {0x00, 0x83, 0x7f, 0xaa},
+       {0x00, 0x84, 0x9b, 0xaa},
+       {0x00, 0x85, 0xba, 0xaa},
+       {0x00, 0x86, 0xd4, 0xaa},
+       {0x00, 0x87, 0xea, 0xaa},
+       {0x00, 0x57, 0x2a, 0xaa},
+       {0x00, 0x03, 0x01, 0xaa},
+       {0x00, 0x04, 0x10, 0xaa},
+       {0x00, 0x05, 0x10, 0xaa},
+       {0x00, 0x06, 0x10, 0xaa},
+       {0x00, 0x07, 0x10, 0xaa},
+       {0x00, 0x08, 0x13, 0xaa},
+       {0x00, 0x0a, 0x00, 0xaa},
+       {0x00, 0x0b, 0x10, 0xaa},
+       {0x00, 0x0c, 0x20, 0xaa},
+       {0x00, 0x0d, 0x18, 0xaa},
+       {0x00, 0x22, 0x01, 0xaa},
+       {0x00, 0x23, 0x60, 0xaa},
+       {0x00, 0x25, 0x08, 0xaa},
+       {0x00, 0x26, 0x82, 0xaa},
+       {0x00, 0x2e, 0x0f, 0xaa},
+       {0x00, 0x2f, 0x1e, 0xaa},
+       {0x00, 0x30, 0x2d, 0xaa},
+       {0x00, 0x31, 0x3c, 0xaa},
+       {0x00, 0x32, 0x4b, 0xaa},
+       {0x00, 0x33, 0x5a, 0xaa},
+       {0x00, 0x34, 0x69, 0xaa},
+       {0x00, 0x35, 0x78, 0xaa},
+       {0x00, 0x36, 0x87, 0xaa},
+       {0x00, 0x37, 0x96, 0xaa},
+       {0x00, 0x38, 0xa5, 0xaa},
+       {0x00, 0x39, 0xb4, 0xaa},
+       {0x00, 0x3a, 0xc3, 0xaa},
+       {0x00, 0x3b, 0xd2, 0xaa},
+       {0x00, 0x3c, 0xe1, 0xaa},
+       {0x00, 0x3e, 0xff, 0xaa},
+       {0x00, 0x3f, 0xff, 0xaa},
+       {0x00, 0x40, 0xff, 0xaa},
+       {0x00, 0x41, 0xff, 0xaa},
+       {0x00, 0x42, 0xff, 0xaa},
+       {0x00, 0x43, 0xff, 0xaa},
+       {0x00, 0x03, 0x00, 0xaa},
+       {0x00, 0x03, 0x00, 0xaa},
+       {0x00, 0x20, 0xc4, 0xaa},
+       {0x00, 0x13, 0x03, 0xaa},
+       {0x00, 0x3c, 0x50, 0xaa},
+       {0x00, 0x61, 0x6a, 0xaa},       /* sharpness? */
+       {0x00, 0x51, 0x5b, 0xaa},
+       {0x00, 0x52, 0x91, 0xaa},
+       {0x00, 0x53, 0x4c, 0xaa},
+       {0x00, 0x54, 0x50, 0xaa},
+       {0x00, 0x56, 0x02, 0xaa},
+       {0xb6, 0x00, 0x00, 0xcc},
+       {0xb6, 0x03, 0x03, 0xcc},
+       {0xb6, 0x02, 0x20, 0xcc},
+       {0xb6, 0x05, 0x02, 0xcc},
+       {0xb6, 0x04, 0x58, 0xcc},
+       {0xb6, 0x12, 0xf8, 0xcc},
+       {0xb6, 0x13, 0x21, 0xcc},
+       {0xb6, 0x18, 0x03, 0xcc},
+       {0xb6, 0x17, 0xa9, 0xcc},
+       {0xb6, 0x16, 0x80, 0xcc},
+       {0xb6, 0x22, 0x12, 0xcc},
+       {0xb6, 0x23, 0x0b, 0xcc},
+       {0xbf, 0xc0, 0x39, 0xcc},
+       {0xbf, 0xc1, 0x04, 0xcc},
+       {0xbf, 0xcc, 0x00, 0xcc},
+       {0xb8, 0x06, 0x20, 0xcc},
+       {0xb8, 0x07, 0x03, 0xcc},
+       {0xb8, 0x08, 0x58, 0xcc},
+       {0xb8, 0x09, 0x02, 0xcc},
+       {0xb3, 0x01, 0x41, 0xcc},
+       {0x00, 0x03, 0x00, 0xaa},
+       {0x00, 0xd9, 0x0f, 0xaa},
+       {0x00, 0xda, 0xaa, 0xaa},
+       {0x00, 0xd9, 0x10, 0xaa},
+       {0x00, 0xda, 0xaa, 0xaa},
+       {0x00, 0xd9, 0x11, 0xaa},
+       {0x00, 0xda, 0x00, 0xaa},
+       {0x00, 0xd9, 0x12, 0xaa},
+       {0x00, 0xda, 0xff, 0xaa},
+       {0x00, 0xd9, 0x13, 0xaa},
+       {0x00, 0xda, 0xff, 0xaa},
+       {0x00, 0xe8, 0x11, 0xaa},
+       {0x00, 0xe9, 0x12, 0xaa},
+       {0x00, 0xea, 0x5c, 0xaa},
+       {0x00, 0xeb, 0xff, 0xaa},
+       {0x00, 0xd8, 0x80, 0xaa},
+       {0x00, 0xe6, 0x02, 0xaa},
+       {0x00, 0xd6, 0x40, 0xaa},
+       {0x00, 0xe3, 0x05, 0xaa},
+       {0x00, 0xe0, 0x40, 0xaa},
+       {0x00, 0xde, 0x03, 0xaa},
+       {0x00, 0xdf, 0x03, 0xaa},
+       {0x00, 0xdb, 0x02, 0xaa},
+       {0x00, 0xdc, 0x00, 0xaa},
+       {0x00, 0xdd, 0x03, 0xaa},
+       {0x00, 0xe1, 0x08, 0xaa},
+       {0x00, 0xe2, 0x01, 0xaa},
+       {0x00, 0xd6, 0x40, 0xaa},
+       {0x00, 0xe4, 0x40, 0xaa},
+       {0x00, 0xa8, 0x8f, 0xaa},
+       {0x00, 0xb4, 0x16, 0xaa},
+       {0xb0, 0x02, 0x06, 0xcc},
+       {0xb0, 0x18, 0x06, 0xcc},
+       {0xb0, 0x19, 0x06, 0xcc},
+       {0xb3, 0x5d, 0x18, 0xcc},
+       {0xb3, 0x05, 0x00, 0xcc},
+       {0xb3, 0x06, 0x00, 0xcc},
+       {0x00, 0xb4, 0x0e, 0xaa},
+       {0x00, 0xb5, 0x49, 0xaa},
+       {0x00, 0xb6, 0x1c, 0xaa},
+       {0x00, 0xb7, 0x96, 0xaa},
+/* end of usbvm326.inf - start of ms-win trace */
+       {0xb6, 0x12, 0xf8, 0xcc},
+       {0xb6, 0x13, 0x3d, 0xcc},
+/*read b306*/
+       {0x00, 0x03, 0x00, 0xaa},
+       {0x00, 0x1a, 0x09, 0xaa},
+       {0x00, 0x1b, 0x8a, 0xaa},
+/*read b827*/
+       {0xb8, 0x27, 0x00, 0xcc},
+       {0xb8, 0x26, 0x60, 0xcc},
+       {0xb8, 0x26, 0x60, 0xcc},
+/*gamma - to do?*/
+       {0x00, 0x03, 0x00, 0xaa},
+       {0x00, 0xae, 0x84, 0xaa},
+/*gamma again*/
+       {0x00, 0x03, 0x00, 0xaa},
+       {0x00, 0x96, 0xa0, 0xaa},
+/*matrix*/
+       {0x00, 0x03, 0x00, 0xaa},
+       {0x00, 0x91, 0x35, 0xaa},
+       {0x00, 0x92, 0x22, 0xaa},
+/*gamma*/
+       {0x00, 0x03, 0x00, 0xaa},
+       {0x00, 0x95, 0x85, 0xaa},
+/*matrix*/
+       {0x00, 0x03, 0x00, 0xaa},
+       {0x00, 0x4d, 0x20, 0xaa},
+       {0xb8, 0x22, 0x40, 0xcc},
+       {0xb8, 0x23, 0x40, 0xcc},
+       {0xb8, 0x24, 0x40, 0xcc},
+       {0xb8, 0x81, 0x09, 0xcc},
+       {0x00, 0x00, 0x64, 0xdd},
+       {0x00, 0x03, 0x01, 0xaa},
+/*read 46*/
+       {0x00, 0x46, 0x3c, 0xaa},
+       {0x00, 0x03, 0x00, 0xaa},
+       {0x00, 0x16, 0x40, 0xaa},
+       {0x00, 0x17, 0x40, 0xaa},
+       {0x00, 0x18, 0x40, 0xaa},
+       {0x00, 0x19, 0x41, 0xaa},
+       {0x00, 0x03, 0x01, 0xaa},
+       {0x00, 0x46, 0x3c, 0xaa},
+       {0x00, 0x00, 0x18, 0xdd},
+/*read bfff*/
+       {0x00, 0x03, 0x00, 0xaa},
+       {0x00, 0xb4, 0x1c, 0xaa},
+       {0x00, 0xb5, 0x92, 0xaa},
+       {0x00, 0xb6, 0x39, 0xaa},
+       {0x00, 0xb7, 0x24, 0xaa},
+/*write 89 0400 1415*/
+};
+
 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 */
+       {-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_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, 0x3130, 0x24, 0x25, 0x01},
-       {SENSOR_MI1320,     0x80 | 0xc8, 0x00, 0x148c, 0x64, 0x65, 0x01},
+/*     {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},
-       {SENSOR_MI1310_SOC, 0x80 | 0x5d, 0x00, 0x143a, 0x24, 0x25, 0x01},
 };
 
-static void reg_r(struct usb_device *dev,
-                          __u16 req,
-                          __u16 index,
-                          __u8 *buffer, __u16 length)
+/* read 'len' bytes in gspca_dev->usb_buf */
+static void reg_r(struct gspca_dev *gspca_dev,
+                 u16 req,
+                 u16 index,
+                 u16 len)
 {
-       usb_control_msg(dev,
-                       usb_rcvctrlpipe(dev, 0),
+       usb_control_msg(gspca_dev->dev,
+                       usb_rcvctrlpipe(gspca_dev->dev, 0),
                        req,
                        USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
                        1,                      /* value */
-                       index, buffer, length,
+                       index, gspca_dev->usb_buf, len,
                        500);
 }
 
 static void reg_w(struct usb_device *dev,
-                           __u16 req,
-                           __u16 value,
-                           __u16 index)
+                           u16 req,
+                           u16 value,
+                           u16 index)
 {
        usb_control_msg(dev,
                        usb_sndctrlpipe(dev, 0),
@@ -1237,55 +2478,60 @@ static void reg_w(struct usb_device *dev,
                        500);
 }
 
-static void vc032x_read_sensor_register(struct usb_device *dev,
-                               __u16 address, __u16 *value)
+static u16 read_sensor_register(struct gspca_dev *gspca_dev,
+                               u16 address)
 {
-       __u8 ldata, mdata, hdata;
-       __u8 tmpvalue = 0;
+       struct usb_device *dev = gspca_dev->dev;
+       u8 ldata, mdata, hdata;
        int retry = 50;
-       ldata = 0;
-       mdata = 0;
-       hdata = 0;
-       *value = 0;
-
-       reg_r(dev, 0xa1, 0xb33f, &tmpvalue, 1);
-       /*PDEBUG(D_PROBE, " I2c Bus Busy Wait  0x%02X ", tmpvalue); */
-       if (!(tmpvalue & 0x02)) {
-               PDEBUG(D_ERR, "I2c Bus Busy Wait %d", tmpvalue & 0x02);
-               return;
+
+       reg_r(gspca_dev, 0xa1, 0xb33f, 1);
+       if (!(gspca_dev->usb_buf[0] & 0x02)) {
+               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);
 
-       tmpvalue = 0;
-       reg_r(dev, 0xa1, 0xb33b, &tmpvalue, 1);
-       while (retry-- && tmpvalue) {
-               reg_r(dev, 0xa1, 0xb33b, &tmpvalue, 1);
-/*             PDEBUG(D_PROBE, "Read again 0xb33b %d", tmpvalue); */
-               msleep(1);
-       }
-       reg_r(dev, 0xa1, 0xb33e, &hdata, 1);
-       reg_r(dev, 0xa1, 0xb33d, &mdata, 1);
-       reg_r(dev, 0xa1, 0xb33c, &ldata, 1);
-       PDEBUG(D_PROBE, "Read Sensor h (0x%02X) m (0x%02X) l (0x%02X)",
-               hdata, mdata, ldata);
-       tmpvalue = 0;
-       reg_r(dev, 0xa1, 0xb334, &tmpvalue, 1);
-       if (tmpvalue == 0x02)
-               *value = (ldata << 8) + mdata;
-       else
-               *value = ldata;
+       do {
+               reg_r(gspca_dev, 0xa1, 0xb33b, 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];
+       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)
+               return (hdata << 8) + mdata;
+       return hdata;
 }
+
 static int vc032x_probe_sensor(struct gspca_dev *gspca_dev)
 {
+       struct sd *sd = (struct sd *) gspca_dev;
        struct usb_device *dev = gspca_dev->dev;
        int i;
-       __u8 data;
-       __u16 value;
+       u16 value;
        const struct sensor_info *ptsensor_info;
 
-       reg_r(dev, 0xa1, 0xbfcf, &data, 1);
-       PDEBUG(D_PROBE, "check sensor header %d", data);
+/*fixme: should also check the other sensor (back mi1320_soc, front mc501cb)*/
+       if (sd->flags & FL_SAMSUNG) {
+               reg_w(dev, 0xa0, 0x01, 0xb301);
+               reg_w(dev, 0x89, 0xf0ff, 0xffff); /* select the back sensor */
+       }
+
+       reg_r(gspca_dev, 0xa1, 0xbfcf, 1);
+       PDEBUG(D_PROBE, "check sensor header %02x", gspca_dev->usb_buf[0]);
        for (i = 0; i < ARRAY_SIZE(sensor_info_data); i++) {
                ptsensor_info = &sensor_info_data[i];
                reg_w(dev, 0xa0, 0x02, 0xb334);
@@ -1294,64 +2540,66 @@ static int vc032x_probe_sensor(struct gspca_dev *gspca_dev)
                reg_w(dev, 0xa0, 0x01, 0xb308);
                reg_w(dev, 0xa0, 0x0c, 0xb309);
                reg_w(dev, 0xa0, ptsensor_info->I2cAdd, 0xb335);
-/*             PDEBUG(D_PROBE,
-                       "check sensor VC032X -> %d Add -> ox%02X!",
-                       i, ptsensor_info->I2cAdd); */
                reg_w(dev, 0xa0, ptsensor_info->op, 0xb301);
-               vc032x_read_sensor_register(dev, ptsensor_info->IdAdd, &value);
-               if (value == ptsensor_info->VpId) {
-/*                     PDEBUG(D_PROBE, "find sensor VC032X -> ox%04X!",
-                               ptsensor_info->VpId); */
-                       return ptsensor_info->sensorId;
+               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 usb_device *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 */
 {
-       __u8 retbyte;
-
-       if (size > 3 || size < 1)
-               return -EINVAL;
-       reg_r(dev, 0xa1, 0xb33f, &retbyte, 1);
-       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[1] , 0xb337);
-               reg_w(dev, 0xa0, val[2] , 0xb338);
-               break;
-       default:
-               reg_w(dev, 0xa0, 0x01, 0xb334);
-               return -EINVAL;
-       }
+       struct usb_device *dev = gspca_dev->dev;
+       int retry;
+
+       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);
+       reg_w(dev, 0xa0, val[0], 0xb336);
+       if (size > 1)
+               reg_w(dev, 0xa0, val[1], 0xb337);
        reg_w(dev, 0xa0, 0x01, 0xb339);
-       reg_r(dev, 0xa1, 0xb33b, &retbyte, 1);
-       return retbyte == 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,
-                       const __u8 *tab, __u8 tabsize, __u16 addr)
+                       const u8 *tab, u8 tabsize, u16 addr)
 {
        int j;
-       __u16 ad = addr;
+       u16 ad = addr;
 
        for (j = 0; j < tabsize; j++)
                reg_w(gspca_dev->dev, 0xa0, tab[j], ad++);
 }
 
 static void usb_exchange(struct gspca_dev *gspca_dev,
-                       const __u8 data[][4])
+                       const u8 data[][4])
 {
        struct usb_device *dev = gspca_dev->dev;
        int i = 0;
@@ -1362,13 +2610,13 @@ 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(dev, data[i][1], &data[i][2], 1);
+                       i2c_write(gspca_dev, data[i][1], &data[i][2], 1);
                        break;
                case 0xbb:                      /* i2c op */
-                       i2c_write(dev, data[i][0], &data[i][1], 2);
+                       i2c_write(gspca_dev, data[i][0], &data[i][1], 2);
                        break;
                case 0xdd:
                        msleep(data[i][2] + 10);
@@ -1379,19 +2627,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,
@@ -1400,56 +2635,22 @@ static int sd_config(struct gspca_dev *gspca_dev,
        struct sd *sd = (struct sd *) gspca_dev;
        struct usb_device *dev = gspca_dev->dev;
        struct cam *cam;
-       __u8 tmp2[4];
        int sensor;
-       __u16 vendor;
-       __u16 product;
-
-       vendor = id->idVendor;
-       product = id->idProduct;
-       switch (vendor) {
-       case 0x046d:            /* Logitech Labtec */
-/*             switch (product) { */
-/*             case 0x0892: */
-/*             case 0x0896: */
-                       sd->bridge = BRIDGE_VC0321;
-/*                     break; */
-/*             } */
-               break;
-       case 0x0ac8:            /* Vimicro z-star */
-               switch (product) {
-               case 0x0321:
-               case 0x0328:
-               case 0xc001:
-               case 0xc002:
-                       sd->bridge = BRIDGE_VC0321;
-                       break;
-               case 0x0323:
-                       sd->bridge = BRIDGE_VC0323;
-                       break;
-               }
-               break;
-       case 0x17ef:            /* Lenovo */
-/*             switch (product) { */
-/*             case 0x4802:     * Lenovo MI1310_SOC */
-                       sd->bridge = BRIDGE_VC0323;
-/*                     break; */
-/*             } */
-               break;
-       }
+       static u8 npkt[] = {    /* number of packets per ISOC message */
+               64,             /* HV7131R 0 */
+               32,             /* MI0360 1 */
+               32,             /* MI1310_SOC 2 */
+               64,             /* MI1320 3 */
+               128,            /* MI1320_SOC 4 */
+               32,             /* OV7660 5 */
+               64,             /* OV7670 6 */
+               128,            /* PO1200 7 */
+               128,            /* PO3130NC 8 */
+       };
 
        cam = &gspca_dev->cam;
-       cam->dev_name = (char *) id->driver_info;
-       cam->epaddr = 0x02;
-       if (sd->bridge == BRIDGE_VC0321) {
-               cam->cam_mode = vc0321_mode;
-               cam->nmodes = sizeof vc0321_mode / sizeof vc0321_mode[0];
-       } else {
-               cam->cam_mode = vc0323_mode;
-               cam->nmodes = sizeof vc0323_mode / sizeof vc0323_mode[0];
-       }
-
-       vc0321_reset(gspca_dev);
+       sd->bridge = id->driver_info >> 8;
+       sd->flags = id->driver_info & 0xff;
        sensor = vc032x_probe_sensor(gspca_dev);
        switch (sensor) {
        case -1:
@@ -1457,61 +2658,142 @@ static int sd_config(struct gspca_dev *gspca_dev,
                return -EINVAL;
        case SENSOR_HV7131R:
                PDEBUG(D_PROBE, "Find Sensor HV7131R");
-               sd->sensor = SENSOR_HV7131R;
+               break;
+       case SENSOR_MI0360:
+               PDEBUG(D_PROBE, "Find Sensor MI0360");
+               sd->bridge = BRIDGE_VC0323;
                break;
        case SENSOR_MI1310_SOC:
                PDEBUG(D_PROBE, "Find Sensor MI1310_SOC");
-               sd->sensor = SENSOR_MI1310_SOC;
                break;
        case SENSOR_MI1320:
                PDEBUG(D_PROBE, "Find Sensor MI1320");
-               sd->sensor = SENSOR_MI1320;
+               break;
+       case SENSOR_MI1320_SOC:
+               PDEBUG(D_PROBE, "Find Sensor MI1320_SOC");
                break;
        case SENSOR_OV7660:
                PDEBUG(D_PROBE, "Find Sensor OV7660");
-               sd->sensor = SENSOR_OV7660;
                break;
        case SENSOR_OV7670:
                PDEBUG(D_PROBE, "Find Sensor OV7670");
-               sd->sensor = SENSOR_OV7670;
+               break;
+       case SENSOR_PO1200:
+               PDEBUG(D_PROBE, "Find Sensor PO1200");
                break;
        case SENSOR_PO3130NC:
                PDEBUG(D_PROBE, "Find Sensor PO3130NC");
-               sd->sensor = SENSOR_PO3130NC;
+               break;
+       }
+       sd->sensor = sensor;
+
+       if (sd->bridge == BRIDGE_VC0321) {
+               cam->cam_mode = vc0321_mode;
+               cam->nmodes = ARRAY_SIZE(vc0321_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;
+               }
+       }
+       cam->npkt = npkt[sd->sensor];
+
+       sd->hflip = HFLIP_DEF;
+       sd->vflip = VFLIP_DEF;
+       if (sd->sensor == SENSOR_OV7670)
+               sd->flags |= FL_HFLIP | FL_VFLIP;
+       sd->lightfreq = FREQ_DEF;
+       if (sd->sensor != SENSOR_OV7670)
+               gspca_dev->ctrl_dis = (1 << LIGHTFREQ_IDX);
+       switch (sd->sensor) {
+       case SENSOR_MI1310_SOC:
+       case SENSOR_MI1320_SOC:
+       case SENSOR_OV7660:
+       case SENSOR_OV7670:
+       case SENSOR_PO1200:
+               break;
+       default:
+               gspca_dev->ctrl_dis = (1 << HFLIP_IDX)
+                                       | (1 << VFLIP_IDX);
                break;
        }
 
-       sd->qindex = 7;
-       sd->autogain = sd_ctrls[SD_AUTOGAIN].qctrl.default_value;
+       sd->sharpness = SHARPNESS_DEF;
 
        if (sd->bridge == BRIDGE_VC0321) {
-               reg_r(dev, 0x8a, 0, tmp2, 3);
+               reg_r(gspca_dev, 0x8a, 0, 3);
                reg_w(dev, 0x87, 0x00, 0x0f0f);
 
-               reg_r(dev, 0x8b, 0, tmp2, 3);
+               reg_r(gspca_dev, 0x8b, 0, 3);
                reg_w(dev, 0x88, 0x00, 0x0202);
        }
        return 0;
 }
 
-/* this function is called at open time */
-static int sd_open(struct gspca_dev *gspca_dev)
+/* this function is called at probe and resume time */
+static int sd_init(struct gspca_dev *gspca_dev)
 {
        return 0;
 }
 
-static void setquality(struct gspca_dev *gspca_dev)
-{
-}
-
-static void setautogain(struct gspca_dev *gspca_dev)
+/* some sensors only */
+static void sethvflip(struct gspca_dev *gspca_dev)
 {
+       struct sd *sd = (struct sd *) gspca_dev;
+       u8 data[2], hflip, vflip;
+
+       hflip = sd->hflip;
+       if (sd->flags & FL_HFLIP)
+               hflip = !hflip;
+       vflip = sd->vflip;
+       if (sd->flags & FL_VFLIP)
+               vflip = !vflip;
+       switch (sd->sensor) {
+       case SENSOR_MI1310_SOC:
+       case SENSOR_MI1320_SOC:
+               data[0] = data[1] = 0;          /* select page 0 */
+               i2c_write(gspca_dev, 0xf0, data, 2);
+               data[0] = sd->sensor == SENSOR_MI1310_SOC ? 0x03 : 0x01;
+               data[1] = 0x02 * hflip
+                       | 0x01 * vflip;
+               i2c_write(gspca_dev, 0x20, data, 2);
+               break;
+       case SENSOR_OV7660:
+       case SENSOR_OV7670:
+               data[0] = sd->sensor == SENSOR_OV7660 ? 0x01 : 0x07;
+               data[0] |= OV7660_MVFP_MIRROR * hflip
+                       | OV7660_MVFP_VFLIP * vflip;
+               i2c_write(gspca_dev, OV7660_REG_MVFP, data, 1);
+               break;
+       case SENSOR_PO1200:
+               data[0] = 0;
+               i2c_write(gspca_dev, 0x03, data, 1);
+               data[0] = 0x80 * hflip
+                       | 0x40 * vflip
+                       | 0x06;
+               i2c_write(gspca_dev, 0x1e, data, 1);
+               break;
+       }
 }
 
 static void setlightfreq(struct gspca_dev *gspca_dev)
 {
        struct sd *sd = (struct sd *) gspca_dev;
-       static const __u8 (*ov7660_freq_tb[3])[4] =
+       static const u8 (*ov7660_freq_tb[3])[4] =
                {ov7660_NoFliker, ov7660_50HZ, ov7660_60HZ};
 
        if (sd->sensor != SENSOR_OV7660)
@@ -1519,13 +2801,39 @@ static void setlightfreq(struct gspca_dev *gspca_dev)
        usb_exchange(gspca_dev, ov7660_freq_tb[sd->lightfreq]);
 }
 
-static void sd_start(struct gspca_dev *gspca_dev)
+/* po1200 only */
+static void setsharpness(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       u8 data;
+
+       if (sd->sensor != SENSOR_PO1200)
+               return;
+       data = 0;
+       i2c_write(gspca_dev, 0x03, &data, 1);
+       data = 0xb5 + sd->sharpness * 3;
+       i2c_write(gspca_dev, 0x61, &data, 1);
+}
+
+static int sd_start(struct gspca_dev *gspca_dev)
 {
        struct sd *sd = (struct sd *) gspca_dev;
-/*     __u8 tmp2; */
-       const __u8 *GammaT = NULL;
-       const __u8 *MatrixT = NULL;
+       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,
+       };
+
+/*fixme: back sensor only*/
+       if (sd->flags & FL_SAMSUNG) {
+               reg_w(gspca_dev->dev, 0x89, 0xf0ff, 0xffff);
+               reg_w(gspca_dev->dev, 0xa9, 0x8348, 0x000e);
+               reg_w(gspca_dev->dev, 0xa9, 0x0000, 0x001a);
+       }
 
        /* Assume start use the good resolution from gspca_dev->mode */
        if (sd->bridge == BRIDGE_VC0321) {
@@ -1533,147 +2841,154 @@ static void 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].mode;
+       mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
        switch (sd->sensor) {
        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)
+                       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;
        default:
-               PDEBUG(D_PROBE, "Damned !! no sensor found Bye");
-               return;
+/*     case SENSOR_PO1200: */
+               GammaT = po1200_gamma;
+               MatrixT = po1200_matrix;
+               init = po1200_initVGA_data;
+               break;
        }
+       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->dev, 0xa1, 0xb881, &tmp2, 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 */
-               reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
+               switch (sd->sensor) {
+               case SENSOR_PO1200:
+               case SENSOR_HV7131R:
+                       reg_w(gspca_dev->dev, 0x89, 0x0400, 0x1415);
+                       break;
+               case SENSOR_MI1310_SOC:
+                       reg_w(gspca_dev->dev, 0x89, 0x058c, 0x0000);
+                       break;
+               default:
+                       if (!(sd->flags & FL_SAMSUNG))
+                               reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
+                       break;
+               }
                msleep(100);
-               setquality(gspca_dev);
-               setautogain(gspca_dev);
+               setsharpness(gspca_dev);
+               sethvflip(gspca_dev);
                setlightfreq(gspca_dev);
        }
+       return 0;
 }
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
 {
        struct usb_device *dev = gspca_dev->dev;
+       struct sd *sd = (struct sd *) gspca_dev;
 
-       reg_w(dev, 0x89, 0xffff, 0xffff);
+       if (sd->sensor == SENSOR_MI1310_SOC)
+               reg_w(dev, 0x89, 0x058c, 0x00ff);
+       else if (!(sd->flags & FL_SAMSUNG))
+               reg_w(dev, 0x89, 0xffff, 0xffff);
        reg_w(dev, 0xa0, 0x01, 0xb301);
        reg_w(dev, 0xa0, 0x09, 0xb003);
 }
 
+/* called on streamoff with alt 0 and on disconnect */
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
        struct usb_device *dev = gspca_dev->dev;
+       struct sd *sd = (struct sd *) gspca_dev;
 
-       reg_w(dev, 0x89, 0xffff, 0xffff);
-}
-
-/* this function is called at close time */
-static void sd_close(struct gspca_dev *gspca_dev)
-{
-/*     struct usb_device *dev = gspca_dev->dev;
-       __u8 buffread;
-
-       reg_w(dev, 0x89, 0xffff, 0xffff);
-       reg_w(dev, 0xa0, 0x01, 0xb301);
-       reg_w(dev, 0xa0, 0x09, 0xb303);
-       reg_w(dev, 0x89, 0xffff, 0xffff);
-*/
+       if (!gspca_dev->present)
+               return;
+/*fixme: is this useful?*/
+       if (sd->sensor == SENSOR_MI1310_SOC)
+               reg_w(dev, 0x89, 0x058c, 0x00ff);
+       else if (!(sd->flags & FL_SAMSUNG))
+               reg_w(dev, 0x89, 0xffff, 0xffff);
 }
 
 static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                        struct gspca_frame *frame,      /* target */
-                       __u8 *data,                     /* isoc packet */
+                       u8 *data,                       /* isoc packet */
                        int len)                        /* iso pkt length */
 {
        struct sd *sd = (struct sd *) gspca_dev;
@@ -1683,34 +2998,54 @@ 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;
        }
+
+       /* The vc0321 sends some additional data after sending the complete
+        * frame, we ignore this. */
+       if (sd->bridge == BRIDGE_VC0321
+           && len > frame->v4l2_buf.length - (frame->data_end - frame->data))
+               len = frame->v4l2_buf.length - (frame->data_end - frame->data);
        gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
 }
 
-static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)
+static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->hflip = val;
+       if (gspca_dev->streaming)
+               sethvflip(gspca_dev);
+       return 0;
+}
+
+static int sd_gethflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       *val = sd->hflip;
+       return 0;
+}
+
+static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val)
 {
        struct sd *sd = (struct sd *) gspca_dev;
 
-       sd->autogain = val;
+       sd->vflip = val;
        if (gspca_dev->streaming)
-               setautogain(gspca_dev);
+               sethvflip(gspca_dev);
        return 0;
 }
 
-static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)
+static int sd_getvflip(struct gspca_dev *gspca_dev, __s32 *val)
 {
        struct sd *sd = (struct sd *) gspca_dev;
 
-       *val = sd->autogain;
+       *val = sd->vflip;
        return 0;
 }
 
@@ -1732,23 +3067,33 @@ static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val)
        return 0;
 }
 
+static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->sharpness = val;
+       if (gspca_dev->streaming)
+               setsharpness(gspca_dev);
+       return 0;
+}
+
+static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       *val = sd->sharpness;
+       return 0;
+}
+
 static int sd_querymenu(struct gspca_dev *gspca_dev,
                        struct v4l2_querymenu *menu)
 {
+       static const char *freq_nm[3] = {"NoFliker", "50 Hz", "60 Hz"};
+
        switch (menu->id) {
        case V4L2_CID_POWER_LINE_FREQUENCY:
-               switch (menu->index) {
-               case 0:         /* V4L2_CID_POWER_LINE_FREQUENCY_DISABLED */
-                       strcpy((char *) menu->name, "NoFliker");
-                       return 0;
-               case 1:         /* V4L2_CID_POWER_LINE_FREQUENCY_50HZ */
-                       strcpy((char *) menu->name, "50 Hz");
-                       return 0;
-               case 2:         /* V4L2_CID_POWER_LINE_FREQUENCY_60HZ */
-                       strcpy((char *) menu->name, "60 Hz");
-                       return 0;
-               }
-               break;
+               strcpy((char *) menu->name, freq_nm[menu->index]);
+               return 0;
        }
        return -EINVAL;
 }
@@ -1759,26 +3104,32 @@ static const struct sd_desc sd_desc = {
        .ctrls = sd_ctrls,
        .nctrls = ARRAY_SIZE(sd_ctrls),
        .config = sd_config,
-       .open = sd_open,
+       .init = sd_init,
        .start = sd_start,
        .stopN = sd_stopN,
        .stop0 = sd_stop0,
-       .close = sd_close,
        .pkt_scan = sd_pkt_scan,
        .querymenu = sd_querymenu,
 };
 
 /* -- module initialisation -- */
-#define DVNM(name) .driver_info = (kernel_ulong_t) name
+#define BF(bridge, flags) \
+       .driver_info = (BRIDGE_ ## bridge << 8) \
+               | (flags)
 static const __devinitdata struct usb_device_id device_table[] = {
-       {USB_DEVICE(0x046d, 0x0892), DVNM("Logitech Orbicam")},
-       {USB_DEVICE(0x046d, 0x0896), DVNM("Logitech Orbicam")},
-       {USB_DEVICE(0x0ac8, 0x0321), DVNM("Vimicro generic vc0321")},
-       {USB_DEVICE(0x0ac8, 0x0323), DVNM("Vimicro Vc0323")},
-       {USB_DEVICE(0x0ac8, 0x0328), DVNM("A4Tech PK-130MG")},
-       {USB_DEVICE(0x0ac8, 0xc001), DVNM("Sony embedded vimicro")},
-       {USB_DEVICE(0x0ac8, 0xc002), DVNM("Sony embedded vimicro")},
-       {USB_DEVICE(0x17ef, 0x4802), DVNM("Lenovo Vc0323+MI1310_SOC")},
+       {USB_DEVICE(0x041e, 0x405b), BF(VC0323, FL_VFLIP)},
+       {USB_DEVICE(0x046d, 0x0892), BF(VC0321, 0)},
+       {USB_DEVICE(0x046d, 0x0896), BF(VC0321, 0)},
+       {USB_DEVICE(0x046d, 0x0897), BF(VC0321, 0)},
+       {USB_DEVICE(0x0ac8, 0x0321), BF(VC0321, 0)},
+       {USB_DEVICE(0x0ac8, 0x0323), BF(VC0323, 0)},
+       {USB_DEVICE(0x0ac8, 0x0328), BF(VC0321, 0)},
+       {USB_DEVICE(0x0ac8, 0xc001), BF(VC0321, 0)},
+       {USB_DEVICE(0x0ac8, 0xc002), BF(VC0321, 0)},
+       {USB_DEVICE(0x0ac8, 0xc301), BF(VC0323, FL_SAMSUNG)},
+       {USB_DEVICE(0x15b8, 0x6001), BF(VC0323, 0)},
+       {USB_DEVICE(0x15b8, 0x6002), BF(VC0323, 0)},
+       {USB_DEVICE(0x17ef, 0x4802), BF(VC0323, 0)},
        {}
 };
 MODULE_DEVICE_TABLE(usb, device_table);
@@ -1796,14 +3147,21 @@ static struct usb_driver sd_driver = {
        .id_table = device_table,
        .probe = sd_probe,
        .disconnect = gspca_disconnect,
+#ifdef CONFIG_PM
+       .suspend = gspca_suspend,
+       .resume = gspca_resume,
+#endif
 };
 
 /* -- module insert / remove -- */
 static int __init sd_mod_init(void)
 {
-       if (usb_register(&sd_driver) < 0)
-               return -1;
-       PDEBUG(D_PROBE, "v%s registered", version);
+       int ret;
+
+       ret = usb_register(&sd_driver);
+       if (ret < 0)
+               return ret;
+       PDEBUG(D_PROBE, "registered");
        return 0;
 }
 static void __exit sd_mod_exit(void)