include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
[safe/jmp/linux-2.6] / drivers / media / video / gspca / vc032x.c
index 26dd155..4989f9a 100644 (file)
@@ -32,14 +32,17 @@ MODULE_LICENSE("GPL");
 struct sd {
        struct gspca_dev gspca_dev;     /* !! must be the first item */
 
-       __u8 hflip;
-       __u8 vflip;
-       __u8 lightfreq;
-       __u8 sharpness;
+       u8 brightness;
+       u8 contrast;
+       u8 colors;
+       u8 hflip;
+       u8 vflip;
+       u8 lightfreq;
+       s8 sharpness;
 
        u8 image_offset;
 
-       char bridge;
+       u8 bridge;
 #define BRIDGE_VC0321 0
 #define BRIDGE_VC0323 1
        u8 sensor;
@@ -52,9 +55,20 @@ struct sd {
 #define SENSOR_OV7670 6
 #define SENSOR_PO1200 7
 #define SENSOR_PO3130NC 8
+#define SENSOR_POxxxx 9
+       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_setbrightness(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val);
+static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val);
+static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val);
+static int sd_getcolors(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);
@@ -64,9 +78,54 @@ 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[] = {
-/* next 2 controls work with ov7660 and ov7670 only */
-#define HFLIP_IDX 0
+static const struct ctrl sd_ctrls[] = {
+#define BRIGHTNESS_IDX 0
+       {
+           {
+               .id      = V4L2_CID_BRIGHTNESS,
+               .type    = V4L2_CTRL_TYPE_INTEGER,
+               .name    = "Brightness",
+               .minimum = 0,
+               .maximum = 255,
+               .step    = 1,
+#define BRIGHTNESS_DEF 128
+               .default_value = BRIGHTNESS_DEF,
+           },
+           .set = sd_setbrightness,
+           .get = sd_getbrightness,
+       },
+#define CONTRAST_IDX 1
+       {
+           {
+               .id      = V4L2_CID_CONTRAST,
+               .type    = V4L2_CTRL_TYPE_INTEGER,
+               .name    = "Contrast",
+               .minimum = 0,
+               .maximum = 255,
+               .step    = 1,
+#define CONTRAST_DEF 127
+               .default_value = CONTRAST_DEF,
+           },
+           .set = sd_setcontrast,
+           .get = sd_getcontrast,
+       },
+#define COLORS_IDX 2
+       {
+           {
+               .id      = V4L2_CID_SATURATION,
+               .type    = V4L2_CTRL_TYPE_INTEGER,
+               .name    = "Saturation",
+               .minimum = 1,
+               .maximum = 127,
+               .step    = 1,
+#define COLOR_DEF 63
+               .default_value = COLOR_DEF,
+           },
+           .set = sd_setcolors,
+           .get = sd_getcolors,
+       },
+/* next 2 controls work with some sensors only */
+#define HFLIP_IDX 3
        {
            {
                .id      = V4L2_CID_HFLIP,
@@ -81,7 +140,7 @@ static struct ctrl sd_ctrls[] = {
            .set = sd_sethflip,
            .get = sd_gethflip,
        },
-#define VFLIP_IDX 1
+#define VFLIP_IDX 4
        {
            {
                .id      = V4L2_CID_VFLIP,
@@ -96,7 +155,7 @@ static struct ctrl sd_ctrls[] = {
            .set = sd_setvflip,
            .get = sd_getvflip,
        },
-#define LIGHTFREQ_IDX 2
+#define LIGHTFREQ_IDX 5
        {
            {
                .id      = V4L2_CID_POWER_LINE_FREQUENCY,
@@ -111,17 +170,16 @@ static struct ctrl sd_ctrls[] = {
            .set = sd_setfreq,
            .get = sd_getfreq,
        },
-/* po1200 only */
-#define SHARPNESS_IDX 3
+#define SHARPNESS_IDX 6
        {
         {
          .id = V4L2_CID_SHARPNESS,
          .type = V4L2_CTRL_TYPE_INTEGER,
          .name = "Sharpness",
-         .minimum = 0,
+         .minimum = -1,
          .maximum = 2,
          .step = 1,
-#define SHARPNESS_DEF 1
+#define SHARPNESS_DEF -1
          .default_value = SHARPNESS_DEF,
          },
         .set = sd_setsharpness,
@@ -129,6 +187,42 @@ static struct ctrl sd_ctrls[] = {
         },
 };
 
+/* table of the disabled controls */
+static u32 ctrl_dis[] = {
+/* SENSOR_HV7131R 0 */
+       (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
+               | (1 << HFLIP_IDX) | (1 << VFLIP_IDX) | (1 << LIGHTFREQ_IDX)
+               | (1 << SHARPNESS_IDX),
+/* SENSOR_MI0360 1 */
+       (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
+               | (1 << HFLIP_IDX) | (1 << VFLIP_IDX) | (1 << LIGHTFREQ_IDX)
+               | (1 << SHARPNESS_IDX),
+/* SENSOR_MI1310_SOC 2 */
+       (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
+               | (1 << LIGHTFREQ_IDX) | (1 << SHARPNESS_IDX),
+/* SENSOR_MI1320 3 */
+       (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
+               | (1 << LIGHTFREQ_IDX) | (1 << SHARPNESS_IDX),
+/* SENSOR_MI1320_SOC 4 */
+       (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
+               | (1 << LIGHTFREQ_IDX) | (1 << SHARPNESS_IDX),
+/* SENSOR_OV7660 5 */
+       (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
+               | (1 << LIGHTFREQ_IDX) | (1 << SHARPNESS_IDX),
+/* SENSOR_OV7670 6 */
+       (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
+               | (1 << SHARPNESS_IDX),
+/* SENSOR_PO1200 7 */
+       (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
+               | (1 << LIGHTFREQ_IDX),
+/* SENSOR_PO3130NC 8 */
+       (1 << BRIGHTNESS_IDX) | (1 << CONTRAST_IDX) | (1 << COLORS_IDX)
+               | (1 << HFLIP_IDX) | (1 << VFLIP_IDX) | (1 << LIGHTFREQ_IDX)
+               | (1 << SHARPNESS_IDX),
+/* SENSOR_POxxxx 9 */
+       (1 << HFLIP_IDX) | (1 << VFLIP_IDX) | (1 << LIGHTFREQ_IDX),
+};
+
 static const struct v4l2_pix_format vc0321_mode[] = {
        {320, 240, V4L2_PIX_FMT_YVYU, V4L2_FIELD_NONE,
                .bytesperline = 320,
@@ -152,9 +246,9 @@ static const struct v4l2_pix_format vc0323_mode[] = {
                .sizeimage = 640 * 480 * 3 / 8 + 590,
                .colorspace = V4L2_COLORSPACE_JPEG,
                .priv = 0},
-       {1280, 1024, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, /* mi13x0_soc only */
+       {1280, 960, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE, /* mi1310_soc only */
                .bytesperline = 1280,
-               .sizeimage = 1280 * 1024 * 1 / 4 + 590,
+               .sizeimage = 1280 * 960 * 3 / 8 + 590,
                .colorspace = V4L2_COLORSPACE_JPEG,
                .priv = 2},
 };
@@ -188,11 +282,11 @@ static const struct v4l2_pix_format svga_mode[] = {
 #define OV7660_MVFP_MIRROR     0x20
 #define OV7660_MVFP_VFLIP      0x10
 
-static const __u8 mi0360_matrix[9] = {
+static const u8 mi0360_matrix[9] = {
        0x50, 0xf8, 0xf8, 0xf5, 0x50, 0xfb, 0xff, 0xf1, 0x50
 };
 
-static const __u8 mi0360_initVGA_JPG[][4] = {
+static const u8 mi0360_initVGA_JPG[][4] = {
        {0xb0, 0x03, 0x19, 0xcc},
        {0xb0, 0x04, 0x02, 0xcc},
        {0xb3, 0x00, 0x24, 0xcc},
@@ -211,7 +305,7 @@ static const __u8 mi0360_initVGA_JPG[][4] = {
        {0xb3, 0x15, 0x00, 0xcc},
        {0xb3, 0x16, 0x02, 0xcc},
        {0xb3, 0x17, 0x7f, 0xcc},
-       {0xb3, 0x35, 0xdd, 0xcc},
+       {0xb3, 0x35, 0xdd, 0xcc},       /* i2c add: 5d */
        {0xb3, 0x34, 0x02, 0xcc},
        {0xb3, 0x00, 0x25, 0xcc},
        {0xbc, 0x00, 0x71, 0xcc},
@@ -301,7 +395,7 @@ static const __u8 mi0360_initVGA_JPG[][4] = {
        {0xb3, 0x5c, 0x01, 0xcc},
        {}
 };
-static const __u8 mi0360_initQVGA_JPG[][4] = {
+static const u8 mi0360_initQVGA_JPG[][4] = {
        {0xb0, 0x03, 0x19, 0xcc},
        {0xb0, 0x04, 0x02, 0xcc},
        {0xb3, 0x00, 0x24, 0xcc},
@@ -421,211 +515,95 @@ static const __u8 mi0360_initQVGA_JPG[][4] = {
        {}
 };
 
-static const __u8 mi1310_socinitVGA_JPG[][4] = {
+static const u8 mi1310_socinitVGA_JPG[][4] = {
        {0xb0, 0x03, 0x19, 0xcc},
        {0xb0, 0x04, 0x02, 0xcc},
-       {0xb3, 0x00, 0x24, 0xcc},
-       {0xb3, 0x00, 0x25, 0xcc},
-       {0xb3, 0x05, 0x01, 0xcc},
-       {0xb3, 0x06, 0x03, 0xcc},
-       {0xb3, 0x5c, 0x01, 0xcc},
+       {0xb3, 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, 0x35, 0xdd, 0xcc},       /* i2c add: 5d */
+       {0xb3, 0x02, 0x00, 0xcc},
        {0xb3, 0x03, 0x0a, 0xcc},
-       {0xb3, 0x04, 0x0d, 0xcc},
+       {0xb3, 0x04, 0x05, 0xcc},
        {0xb3, 0x20, 0x00, 0xcc},
        {0xb3, 0x21, 0x00, 0xcc},
-       {0xb3, 0x22, 0x01, 0xcc},
-       {0xb3, 0x23, 0xe0, 0xcc},
+       {0xb3, 0x22, 0x03, 0xcc},
+       {0xb3, 0x23, 0xc0, 0xcc},
        {0xb3, 0x14, 0x00, 0xcc},
        {0xb3, 0x15, 0x00, 0xcc},
-       {0xb3, 0x16, 0x02, 0xcc},
-       {0xb3, 0x17, 0x7f, 0xcc},
-       {0xb8, 0x01, 0x7d, 0xcc},
-       {0xb8, 0x81, 0x09, 0xcc},
-       {0xb8, 0x27, 0x20, 0xcc},
-       {0xb8, 0x26, 0x80, 0xcc},
-       {0xb3, 0x00, 0x25, 0xcc},
-       {0xb8, 0x00, 0x13, 0xcc},
-       {0xbc, 0x00, 0x71, 0xcc},
-       {0xb8, 0x81, 0x01, 0xcc},
-       {0xb8, 0x2c, 0x5a, 0xcc},
-       {0xb8, 0x2d, 0xff, 0xcc},
-       {0xb8, 0x2e, 0xee, 0xcc},
-       {0xb8, 0x2f, 0xfb, 0xcc},
-       {0xb8, 0x30, 0x52, 0xcc},
-       {0xb8, 0x31, 0xf8, 0xcc},
-       {0xb8, 0x32, 0xf1, 0xcc},
-       {0xb8, 0x33, 0xff, 0xcc},
-       {0xb8, 0x34, 0x54, 0xcc},
-       {0xb8, 0x35, 0x00, 0xcc},
-       {0xb8, 0x36, 0x00, 0xcc},
-       {0xb8, 0x37, 0x00, 0xcc},
+       {0xb3, 0x16, 0x04, 0xcc},
+       {0xb3, 0x17, 0xff, 0xcc},
+       {0xb3, 0x00, 0x65, 0xcc},
+       {0xb8, 0x00, 0x00, 0xcc},
+       {0xbc, 0x00, 0xd0, 0xcc},
+       {0xbc, 0x01, 0x01, 0xcc},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0xc8, 0x9f, 0x0b, 0xbb},
+       {0x5b, 0x00, 0x01, 0xbb},
+       {0x2f, 0xde, 0x20, 0xbb},
        {0xf0, 0x00, 0x00, 0xbb},
-       {0x00, 0x01, 0x00, 0xdd},
-       {0x0d, 0x00, 0x09, 0xbb},
-       {0x0d, 0x00, 0x08, 0xbb},
+       {0x20, 0x03, 0x02, 0xbb},       /* h/v flip */
        {0xf0, 0x00, 0x01, 0xbb},
-       {0x00, 0x01, 0x00, 0xdd},
-       {0x06, 0x00, 0x14, 0xbb},
-       {0x3a, 0x10, 0x00, 0xbb},
-       {0x00, 0x00, 0x10, 0xdd},
-       {0x9b, 0x10, 0x00, 0xbb},
-       {0x00, 0x00, 0x10, 0xdd},
+       {0x05, 0x00, 0x07, 0xbb},
+       {0x34, 0x00, 0x00, 0xbb},
+       {0x35, 0xff, 0x00, 0xbb},
+       {0xdc, 0x07, 0x02, 0xbb},
+       {0xdd, 0x3c, 0x18, 0xbb},
+       {0xde, 0x92, 0x6d, 0xbb},
+       {0xdf, 0xcd, 0xb1, 0xbb},
+       {0xe0, 0xff, 0xe7, 0xbb},
+       {0x06, 0xf0, 0x0d, 0xbb},
+       {0x06, 0x70, 0x0e, 0xbb},
+       {0x4c, 0x00, 0x01, 0xbb},
+       {0x4d, 0x00, 0x01, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x2e, 0x0c, 0x55, 0xbb},
+       {0x21, 0xb6, 0x6e, 0xbb},
+       {0x36, 0x30, 0x10, 0xbb},
+       {0x37, 0x00, 0xc1, 0xbb},
        {0xf0, 0x00, 0x00, 0xbb},
-       {0x00, 0x01, 0x00, 0xdd},
-       {0x2b, 0x00, 0x28, 0xbb},
-       {0x2c, 0x00, 0x30, 0xbb},
-       {0x2d, 0x00, 0x30, 0xbb},
-       {0x2e, 0x00, 0x28, 0xbb},
-       {0x41, 0x00, 0xd7, 0xbb},
-       {0x09, 0x02, 0x3a, 0xbb},
-       {0x0c, 0x00, 0x00, 0xbb},
-       {0x20, 0x00, 0x00, 0xbb},
-       {0x05, 0x00, 0x8c, 0xbb},
-       {0x06, 0x00, 0x32, 0xbb},
-       {0x07, 0x00, 0xc6, 0xbb},
-       {0x08, 0x00, 0x19, 0xbb},
-       {0x24, 0x80, 0x6f, 0xbb},
-       {0xc8, 0x00, 0x0f, 0xbb},
-       {0x20, 0x00, 0x0f, 0xbb},
+       {0x07, 0x00, 0x84, 0xbb},
+       {0x08, 0x02, 0x4a, 0xbb},
+       {0x05, 0x01, 0x10, 0xbb},
+       {0x06, 0x00, 0x39, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x58, 0x02, 0x67, 0xbb},
+       {0x57, 0x02, 0x00, 0xbb},
+       {0x5a, 0x02, 0x67, 0xbb},
+       {0x59, 0x02, 0x00, 0xbb},
+       {0x5c, 0x12, 0x0d, 0xbb},
+       {0x5d, 0x16, 0x11, 0xbb},
+       {0x39, 0x06, 0x18, 0xbb},
+       {0x3a, 0x06, 0x18, 0xbb},
+       {0x3b, 0x06, 0x18, 0xbb},
+       {0x3c, 0x06, 0x18, 0xbb},
+       {0x64, 0x7b, 0x5b, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x36, 0x30, 0x10, 0xbb},
+       {0x37, 0x00, 0xc0, 0xbb},
+       {0xbc, 0x0e, 0x00, 0xcc},
+       {0xbc, 0x0f, 0x05, 0xcc},
+       {0xbc, 0x10, 0xc0, 0xcc},
+       {0xbc, 0x11, 0x03, 0xcc},
        {0xb6, 0x00, 0x00, 0xcc},
        {0xb6, 0x03, 0x02, 0xcc},
        {0xb6, 0x02, 0x80, 0xcc},
        {0xb6, 0x05, 0x01, 0xcc},
        {0xb6, 0x04, 0xe0, 0xcc},
-       {0xb6, 0x12, 0x78, 0xcc},
+       {0xb6, 0x12, 0xf8, 0xcc},
+       {0xb6, 0x13, 0x25, 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},
-       {0xb3, 0x01, 0x41, 0xcc},
-       {0x03, 0x03, 0xc0, 0xbb},
-       {0x06, 0x00, 0x10, 0xbb},
-       {0xb6, 0x12, 0xf8, 0xcc},
-       {0xb8, 0x0c, 0x20, 0xcc},
-       {0xb8, 0x0d, 0x70, 0xcc},
-       {0xb6, 0x13, 0x13, 0xcc},
-       {0x2f, 0x00, 0xC0, 0xbb},
-       {0xb8, 0xa0, 0x12, 0xcc},
-       {},
-};
-static const __u8 mi1310_socinitQVGA_JPG[][4] = {
-       {0xb0, 0x03, 0x19, 0xcc},
-       {0xb0, 0x04, 0x02, 0xcc},
-       {0xb3, 0x00, 0x24, 0xcc},
-       {0xb3, 0x00, 0x25, 0xcc},
-       {0xb3, 0x05, 0x01, 0xcc},
-       {0xb3, 0x06, 0x03, 0xcc},
-       {0xb3, 0x5c, 0x01, 0xcc},
-       {0xb3, 0x08, 0x01, 0xcc},
-       {0xb3, 0x09, 0x0c, 0xcc},
-       {0xb3, 0x34, 0x02, 0xcc},
-       {0xb3, 0x35, 0xdd, 0xcc},
-       {0xb3, 0x03, 0x0a, 0xcc},
-       {0xb3, 0x04, 0x0d, 0xcc},
-       {0xb3, 0x20, 0x00, 0xcc},
-       {0xb3, 0x21, 0x00, 0xcc},
-       {0xb3, 0x22, 0x01, 0xcc},
-       {0xb3, 0x23, 0xe0, 0xcc},
-       {0xb3, 0x14, 0x00, 0xcc},
-       {0xb3, 0x15, 0x00, 0xcc},
-       {0xb3, 0x16, 0x02, 0xcc},
-       {0xb3, 0x17, 0x7f, 0xcc},
-       {0xb8, 0x01, 0x7d, 0xcc},
-       {0xb8, 0x81, 0x09, 0xcc},
-       {0xb8, 0x27, 0x20, 0xcc},
-       {0xb8, 0x26, 0x80, 0xcc},
-       {0xb3, 0x00, 0x25, 0xcc},
-       {0xb8, 0x00, 0x13, 0xcc},
-       {0xbc, 0x00, 0xd1, 0xcc},
-       {0xb8, 0x81, 0x01, 0xcc},
-       {0xb8, 0x2c, 0x5a, 0xcc},
-       {0xb8, 0x2d, 0xff, 0xcc},
-       {0xb8, 0x2e, 0xee, 0xcc},
-       {0xb8, 0x2f, 0xfb, 0xcc},
-       {0xb8, 0x30, 0x52, 0xcc},
-       {0xb8, 0x31, 0xf8, 0xcc},
-       {0xb8, 0x32, 0xf1, 0xcc},
-       {0xb8, 0x33, 0xff, 0xcc},
-       {0xb8, 0x34, 0x54, 0xcc},
-       {0xb8, 0x35, 0x00, 0xcc},
-       {0xb8, 0x36, 0x00, 0xcc},
-       {0xb8, 0x37, 0x00, 0xcc},
-       {0xf0, 0x00, 0x00, 0xbb},
-       {0x00, 0x01, 0x00, 0xdd},
-       {0x0d, 0x00, 0x09, 0xbb},
-       {0x0d, 0x00, 0x08, 0xbb},
-       {0xf0, 0x00, 0x01, 0xbb},
-       {0x00, 0x01, 0x00, 0xdd},
-       {0x06, 0x00, 0x14, 0xbb},
-       {0x3a, 0x10, 0x00, 0xbb},
-       {0x00, 0x00, 0x10, 0xdd},
-       {0x9b, 0x10, 0x00, 0xbb},
-       {0x00, 0x00, 0x10, 0xdd},
-       {0xf0, 0x00, 0x00, 0xbb},
-       {0x00, 0x01, 0x00, 0xdd},
-       {0x2b, 0x00, 0x28, 0xbb},
-       {0x2c, 0x00, 0x30, 0xbb},
-       {0x2d, 0x00, 0x30, 0xbb},
-       {0x2e, 0x00, 0x28, 0xbb},
-       {0x41, 0x00, 0xd7, 0xbb},
-       {0x09, 0x02, 0x3a, 0xbb},
-       {0x0c, 0x00, 0x00, 0xbb},
-       {0x20, 0x00, 0x00, 0xbb},
-       {0x05, 0x00, 0x8c, 0xbb},
-       {0x06, 0x00, 0x32, 0xbb},
-       {0x07, 0x00, 0xc6, 0xbb},
-       {0x08, 0x00, 0x19, 0xbb},
-       {0x24, 0x80, 0x6f, 0xbb},
-       {0xc8, 0x00, 0x0f, 0xbb},
-       {0x20, 0x00, 0x0f, 0xbb},
-       {0xb6, 0x00, 0x00, 0xcc},
-       {0xb6, 0x03, 0x01, 0xcc},
-       {0xb6, 0x02, 0x40, 0xcc},
-       {0xb6, 0x05, 0x00, 0xcc},
-       {0xb6, 0x04, 0xf0, 0xcc},
-       {0xb6, 0x12, 0x78, 0xcc},
-       {0xb6, 0x18, 0x00, 0xcc},
-       {0xb6, 0x17, 0x96, 0xcc},
-       {0xb6, 0x16, 0x00, 0xcc},
-       {0xb6, 0x22, 0x12, 0xcc},
-       {0xb6, 0x23, 0x0b, 0xcc},
-       {0xb3, 0x02, 0x02, 0xcc},
-       {0xbf, 0xc0, 0x39, 0xcc},
-       {0xbf, 0xc1, 0x04, 0xcc},
-       {0xbf, 0xcc, 0x10, 0xcc},
-       {0xb9, 0x12, 0x00, 0xcc},
-       {0xb9, 0x13, 0x0a, 0xcc},
-       {0xb9, 0x14, 0x0a, 0xcc},
-       {0xb9, 0x15, 0x0a, 0xcc},
-       {0xb9, 0x16, 0x0a, 0xcc},
-       {0xb9, 0x18, 0x00, 0xcc},
-       {0xb9, 0x19, 0x0f, 0xcc},
-       {0xb9, 0x1a, 0x0f, 0xcc},
-       {0xb9, 0x1b, 0x0f, 0xcc},
-       {0xb9, 0x1c, 0x0f, 0xcc},
-       {0xb8, 0x8e, 0x00, 0xcc},
-       {0xb8, 0x8f, 0xff, 0xcc},
+       {0xbf, 0xcc, 0x00, 0xcc},
        {0xbc, 0x02, 0x18, 0xcc},
        {0xbc, 0x03, 0x50, 0xcc},
        {0xbc, 0x04, 0x18, 0xcc},
@@ -636,133 +614,335 @@ static const __u8 mi1310_socinitQVGA_JPG[][4] = {
        {0xbc, 0x0a, 0x10, 0xcc},
        {0xbc, 0x0b, 0x00, 0xcc},
        {0xbc, 0x0c, 0x00, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {0xf0, 0x00, 0x01, 0xbb},
+       {0x80, 0x00, 0x03, 0xbb},
+       {0x81, 0xc7, 0x14, 0xbb},
+       {0x82, 0xeb, 0xe8, 0xbb},
+       {0x83, 0xfe, 0xf4, 0xbb},
+       {0x84, 0xcd, 0x10, 0xbb},
+       {0x85, 0xf3, 0xee, 0xbb},
+       {0x86, 0xff, 0xf1, 0xbb},
+       {0x87, 0xcd, 0x10, 0xbb},
+       {0x88, 0xf3, 0xee, 0xbb},
+       {0x89, 0x01, 0xf1, 0xbb},
+       {0x8a, 0xe5, 0x17, 0xbb},
+       {0x8b, 0xe8, 0xe2, 0xbb},
+       {0x8c, 0xf7, 0xed, 0xbb},
+       {0x8d, 0x00, 0xff, 0xbb},
+       {0x8e, 0xec, 0x10, 0xbb},
+       {0x8f, 0xf0, 0xed, 0xbb},
+       {0x90, 0xf9, 0xf2, 0xbb},
+       {0x91, 0x00, 0x00, 0xbb},
+       {0x92, 0xe9, 0x0d, 0xbb},
+       {0x93, 0xf4, 0xf2, 0xbb},
+       {0x94, 0xfb, 0xf5, 0xbb},
+       {0x95, 0x00, 0xff, 0xbb},
+       {0xb6, 0x0f, 0x08, 0xbb},
+       {0xb7, 0x3d, 0x16, 0xbb},
+       {0xb8, 0x0c, 0x04, 0xbb},
+       {0xb9, 0x1c, 0x07, 0xbb},
+       {0xba, 0x0a, 0x03, 0xbb},
+       {0xbb, 0x1b, 0x09, 0xbb},
+       {0xbc, 0x17, 0x0d, 0xbb},
+       {0xbd, 0x23, 0x1d, 0xbb},
+       {0xbe, 0x00, 0x28, 0xbb},
+       {0xbf, 0x11, 0x09, 0xbb},
+       {0xc0, 0x16, 0x15, 0xbb},
+       {0xc1, 0x00, 0x1b, 0xbb},
+       {0xc2, 0x0e, 0x07, 0xbb},
+       {0xc3, 0x14, 0x10, 0xbb},
+       {0xc4, 0x00, 0x17, 0xbb},
+       {0x06, 0x74, 0x8e, 0xbb},
+       {0xf0, 0x00, 0x01, 0xbb},
+       {0x06, 0xf4, 0x8e, 0xbb},
+       {0x00, 0x00, 0x50, 0xdd},
+       {0x06, 0x74, 0x8e, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x24, 0x50, 0x20, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},
+       {0x34, 0x0c, 0x50, 0xbb},
        {0xb3, 0x01, 0x41, 0xcc},
+       {0xf0, 0x00, 0x00, 0xbb},
+       {0x03, 0x03, 0xc0, 0xbb},
+       {},
+};
+static const u8 mi1310_socinitQVGA_JPG[][4] = {
+       {0xb0, 0x03, 0x19, 0xcc},       {0xb0, 0x04, 0x02, 0xcc},
+       {0xb3, 0x00, 0x64, 0xcc},       {0xb3, 0x00, 0x65, 0xcc},
+       {0xb3, 0x05, 0x00, 0xcc},       {0xb3, 0x06, 0x00, 0xcc},
+       {0xb3, 0x08, 0x01, 0xcc},       {0xb3, 0x09, 0x0c, 0xcc},
+       {0xb3, 0x34, 0x02, 0xcc},       {0xb3, 0x35, 0xdd, 0xcc},
+       {0xb3, 0x02, 0x00, 0xcc},       {0xb3, 0x03, 0x0a, 0xcc},
+       {0xb3, 0x04, 0x05, 0xcc},       {0xb3, 0x20, 0x00, 0xcc},
+       {0xb3, 0x21, 0x00, 0xcc},       {0xb3, 0x22, 0x03, 0xcc},
+       {0xb3, 0x23, 0xc0, 0xcc},       {0xb3, 0x14, 0x00, 0xcc},
+       {0xb3, 0x15, 0x00, 0xcc},       {0xb3, 0x16, 0x04, 0xcc},
+       {0xb3, 0x17, 0xff, 0xcc},       {0xb3, 0x00, 0x65, 0xcc},
+       {0xb8, 0x00, 0x00, 0xcc},       {0xbc, 0x00, 0xf0, 0xcc},
+       {0xbc, 0x01, 0x01, 0xcc},       {0xf0, 0x00, 0x02, 0xbb},
+       {0xc8, 0x9f, 0x0b, 0xbb},       {0x5b, 0x00, 0x01, 0xbb},
+       {0x2f, 0xde, 0x20, 0xbb},       {0xf0, 0x00, 0x00, 0xbb},
+       {0x20, 0x03, 0x02, 0xbb},       /* 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, 0x55, 0xbb},
+       {0x21, 0xb6, 0x6e, 0xbb},       {0x36, 0x30, 0x10, 0xbb},
+       {0x37, 0x00, 0xc1, 0xbb},       {0xf0, 0x00, 0x00, 0xbb},
+       {0x07, 0x00, 0x84, 0xbb},       {0x08, 0x02, 0x4a, 0xbb},
+       {0x05, 0x01, 0x10, 0xbb},       {0x06, 0x00, 0x39, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},       {0x58, 0x02, 0x67, 0xbb},
+       {0x57, 0x02, 0x00, 0xbb},       {0x5a, 0x02, 0x67, 0xbb},
+       {0x59, 0x02, 0x00, 0xbb},       {0x5c, 0x12, 0x0d, 0xbb},
+       {0x5d, 0x16, 0x11, 0xbb},       {0x39, 0x06, 0x18, 0xbb},
+       {0x3a, 0x06, 0x18, 0xbb},       {0x3b, 0x06, 0x18, 0xbb},
+       {0x3c, 0x06, 0x18, 0xbb},       {0x64, 0x7b, 0x5b, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},       {0x36, 0x30, 0x10, 0xbb},
+       {0x37, 0x00, 0xc0, 0xbb},       {0xbc, 0x0e, 0x00, 0xcc},
+       {0xbc, 0x0f, 0x05, 0xcc},       {0xbc, 0x10, 0xc0, 0xcc},
+       {0xbc, 0x11, 0x03, 0xcc},       {0xb6, 0x00, 0x00, 0xcc},
+       {0xb6, 0x03, 0x01, 0xcc},       {0xb6, 0x02, 0x40, 0xcc},
+       {0xb6, 0x05, 0x00, 0xcc},       {0xb6, 0x04, 0xf0, 0xcc},
+       {0xb6, 0x12, 0xf8, 0xcc},       {0xb6, 0x13, 0x25, 0xcc},
+       {0xb6, 0x18, 0x00, 0xcc},       {0xb6, 0x17, 0x96, 0xcc},
+       {0xb6, 0x16, 0x00, 0xcc},       {0xb6, 0x22, 0x12, 0xcc},
+       {0xb6, 0x23, 0x0b, 0xcc},       {0xbf, 0xc0, 0x39, 0xcc},
+       {0xbf, 0xc1, 0x04, 0xcc},       {0xbf, 0xcc, 0x00, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},       {0xf0, 0x00, 0x01, 0xbb},
+       {0x80, 0x00, 0x03, 0xbb},       {0x81, 0xc7, 0x14, 0xbb},
+       {0x82, 0xeb, 0xe8, 0xbb},       {0x83, 0xfe, 0xf4, 0xbb},
+       {0x84, 0xcd, 0x10, 0xbb},       {0x85, 0xf3, 0xee, 0xbb},
+       {0x86, 0xff, 0xf1, 0xbb},       {0x87, 0xcd, 0x10, 0xbb},
+       {0x88, 0xf3, 0xee, 0xbb},       {0x89, 0x01, 0xf1, 0xbb},
+       {0x8a, 0xe5, 0x17, 0xbb},       {0x8b, 0xe8, 0xe2, 0xbb},
+       {0x8c, 0xf7, 0xed, 0xbb},       {0x8d, 0x00, 0xff, 0xbb},
+       {0x8e, 0xec, 0x10, 0xbb},       {0x8f, 0xf0, 0xed, 0xbb},
+       {0x90, 0xf9, 0xf2, 0xbb},       {0x91, 0x00, 0x00, 0xbb},
+       {0x92, 0xe9, 0x0d, 0xbb},       {0x93, 0xf4, 0xf2, 0xbb},
+       {0x94, 0xfb, 0xf5, 0xbb},       {0x95, 0x00, 0xff, 0xbb},
+       {0xb6, 0x0f, 0x08, 0xbb},       {0xb7, 0x3d, 0x16, 0xbb},
+       {0xb8, 0x0c, 0x04, 0xbb},       {0xb9, 0x1c, 0x07, 0xbb},
+       {0xba, 0x0a, 0x03, 0xbb},       {0xbb, 0x1b, 0x09, 0xbb},
+       {0xbc, 0x17, 0x0d, 0xbb},       {0xbd, 0x23, 0x1d, 0xbb},
+       {0xbe, 0x00, 0x28, 0xbb},       {0xbf, 0x11, 0x09, 0xbb},
+       {0xc0, 0x16, 0x15, 0xbb},       {0xc1, 0x00, 0x1b, 0xbb},
+       {0xc2, 0x0e, 0x07, 0xbb},       {0xc3, 0x14, 0x10, 0xbb},
+       {0xc4, 0x00, 0x17, 0xbb},       {0x06, 0x74, 0x8e, 0xbb},
+       {0xf0, 0x00, 0x01, 0xbb},       {0x06, 0xf4, 0x8e, 0xbb},
+       {0x00, 0x00, 0x50, 0xdd},       {0x06, 0x74, 0x8e, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},       {0x24, 0x50, 0x20, 0xbb},
+       {0xf0, 0x00, 0x02, 0xbb},       {0x34, 0x0c, 0x50, 0xbb},
+       {0xb3, 0x01, 0x41, 0xcc},       {0xf0, 0x00, 0x00, 0xbb},
        {0x03, 0x03, 0xc0, 0xbb},
-       {0x06, 0x00, 0x10, 0xbb},
-       {0xb6, 0x12, 0xf8, 0xcc},
-       {0xb8, 0x0c, 0x20, 0xcc},
-       {0xb8, 0x0d, 0x70, 0xcc},
-       {0xb6, 0x13, 0x13, 0xcc},
-       {0x2f, 0x00, 0xC0, 0xbb},
-       {0xb8, 0xa0, 0x12, 0xcc},
        {},
 };
 static const u8 mi1310_soc_InitSXGA_JPG[][4] = {
        {0xb0, 0x03, 0x19, 0xcc},
        {0xb0, 0x04, 0x02, 0xcc},
-       {0xb3, 0x00, 0x24, 0xcc},
-       {0xb3, 0x00, 0x25, 0xcc},
+       {0xb3, 0x00, 0x64, 0xcc},
+       {0xb3, 0x00, 0x65, 0xcc},
        {0xb3, 0x05, 0x00, 0xcc},
-       {0xb3, 0x06, 0x01, 0xcc},
-       {0xb3, 0x5c, 0x01, 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, 0x04, 0xcc},
-       {0xb3, 0x23, 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},
-       {0xb8, 0x01, 0x7d, 0xcc},
-       {0xb8, 0x81, 0x09, 0xcc},
-       {0xb8, 0x27, 0x20, 0xcc},
-       {0xb8, 0x26, 0x80, 0xcc},
-       {0xb8, 0x06, 0x00, 0xcc},
-       {0xb8, 0x07, 0x05, 0xcc},
-       {0xb8, 0x08, 0x00, 0xcc},
-       {0xb8, 0x09, 0x04, 0xcc},
-       {0xb3, 0x00, 0x25, 0xcc},
-       {0xb8, 0x00, 0x11, 0xcc},
-       {0xbc, 0x00, 0x71, 0xcc},
-       {0xb8, 0x81, 0x01, 0xcc},
-       {0xb8, 0x2c, 0x5a, 0xcc},
-       {0xb8, 0x2d, 0xff, 0xcc},
-       {0xb8, 0x2e, 0xee, 0xcc},
-       {0xb8, 0x2f, 0xfb, 0xcc},
-       {0xb8, 0x30, 0x52, 0xcc},
-       {0xb8, 0x31, 0xf8, 0xcc},
-       {0xb8, 0x32, 0xf1, 0xcc},
-       {0xb8, 0x33, 0xff, 0xcc},
-       {0xb8, 0x34, 0x54, 0xcc},
+       {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},
-       {0x00, 0x01, 0x00, 0xdd},
-       {0x0d, 0x00, 0x09, 0xbb},
-       {0x0d, 0x00, 0x08, 0xbb},
+       {0x20, 0x03, 0x02, 0xbb},       /* h/v flip */
        {0xf0, 0x00, 0x01, 0xbb},
-       {0x00, 0x01, 0x00, 0xdd},
-       {0x06, 0x00, 0x14, 0xbb},
-       {0x3a, 0x10, 0x00, 0xbb},
-       {0x00, 0x00, 0x10, 0xdd},
-       {0x9b, 0x10, 0x00, 0xbb},
-       {0x00, 0x00, 0x10, 0xdd},
+       {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},
-       {0x00, 0x01, 0x00, 0xdd},
-       {0x2b, 0x00, 0x28, 0xbb},
-       {0x2c, 0x00, 0x30, 0xbb},
-       {0x2d, 0x00, 0x30, 0xbb},
-       {0x2e, 0x00, 0x28, 0xbb},
-       {0x41, 0x00, 0xd7, 0xbb},
-       {0x09, 0x02, 0x3a, 0xbb},
-       {0x0c, 0x00, 0x00, 0xbb},
-       {0x20, 0x00, 0x00, 0xbb},
-       {0x05, 0x00, 0x8c, 0xbb},
-       {0x06, 0x00, 0x32, 0xbb},
-       {0x07, 0x00, 0xc6, 0xbb},
-       {0x08, 0x00, 0x19, 0xbb},
-       {0x24, 0x80, 0x6f, 0xbb},
-       {0xc8, 0x00, 0x0f, 0xbb},
-       {0x20, 0x00, 0x03, 0xbb},
+       {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, 0x04, 0xcc},
-       {0xb6, 0x04, 0x00, 0xcc},
+       {0xb6, 0x05, 0x03, 0xcc},
+       {0xb6, 0x04, 0xc0, 0xcc},
        {0xb6, 0x12, 0xf8, 0xcc},
-       {0xb6, 0x18, 0x0a, 0xcc},
-       {0xb6, 0x17, 0x00, 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},
-       {0xb3, 0x02, 0x02, 0xcc},
        {0xbf, 0xc0, 0x39, 0xcc},
        {0xbf, 0xc1, 0x04, 0xcc},
-       {0xbf, 0xcc, 0x10, 0xcc},
-       {0xb9, 0x12, 0x00, 0xcc},
-       {0xb9, 0x13, 0x14, 0xcc},
-       {0xb9, 0x14, 0x14, 0xcc},
-       {0xb9, 0x15, 0x14, 0xcc},
-       {0xb9, 0x16, 0x14, 0xcc},
-       {0xb9, 0x18, 0x00, 0xcc},
-       {0xb9, 0x19, 0x1e, 0xcc},
-       {0xb9, 0x1a, 0x1e, 0xcc},
-       {0xb9, 0x1b, 0x1e, 0xcc},
-       {0xb9, 0x1c, 0x1e, 0xcc},
+       {0xbf, 0xcc, 0x00, 0xcc},
        {0xb3, 0x01, 0x41, 0xcc},
-       {0xb8, 0x8e, 0x00, 0xcc},
-       {0xb8, 0x8f, 0xff, 0xcc},
-       {0xb6, 0x12, 0xf8, 0xcc},
-       {0xb8, 0x0c, 0x20, 0xcc},
-       {0xb8, 0x0d, 0x70, 0xcc},
-       {0xb6, 0x13, 0x13, 0xcc},
-       {0x2f, 0x00, 0xC0, 0xbb},
-       {0xb8, 0xa0, 0x12, 0xcc},
+       {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},
@@ -770,7 +950,8 @@ static const __u8 mi1320_initVGA_data[][4] = {
        {0xb0, 0x16, 0x03, 0xcc},       {0xb3, 0x05, 0x00, 0xcc},
        {0xb3, 0x06, 0x00, 0xcc},       {0xb3, 0x08, 0x01, 0xcc},
        {0xb3, 0x09, 0x0c, 0xcc},       {0xb3, 0x34, 0x02, 0xcc},
-       {0xb3, 0x35, 0xc8, 0xcc},       {0xb3, 0x02, 0x00, 0xcc},
+       {0xb3, 0x35, 0xc8, 0xcc},       /* i2c add: 48 */
+       {0xb3, 0x02, 0x00, 0xcc},
        {0xb3, 0x03, 0x0a, 0xcc},       {0xb3, 0x04, 0x05, 0xcc},
        {0xb3, 0x20, 0x00, 0xcc},       {0xb3, 0x21, 0x00, 0xcc},
        {0xb3, 0x22, 0x03, 0xcc},       {0xb3, 0x23, 0xc0, 0xcc},
@@ -811,7 +992,8 @@ static const __u8 mi1320_initVGA_data[][4] = {
        {0xc3, 0x01, 0x03, 0xbb},       {0xc4, 0x00, 0x04, 0xbb},
        {0xf0, 0x00, 0x00, 0xbb},       {0x05, 0x01, 0x13, 0xbb},
        {0x06, 0x00, 0x11, 0xbb},       {0x07, 0x00, 0x85, 0xbb},
-       {0x08, 0x00, 0x27, 0xbb},       {0x20, 0x01, 0x03, 0xbb},
+       {0x08, 0x00, 0x27, 0xbb},
+       {0x20, 0x01, 0x00, 0xbb},       /* h/v flips - was 03 */
        {0x21, 0x80, 0x00, 0xbb},       {0x22, 0x0d, 0x0f, 0xbb},
        {0x24, 0x80, 0x00, 0xbb},       {0x59, 0x00, 0xff, 0xbb},
        {0xf0, 0x00, 0x02, 0xbb},       {0x39, 0x03, 0x0d, 0xbb},
@@ -841,7 +1023,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},
@@ -922,7 +1104,7 @@ static const u8 mi1320_soc_InitVGA[][4] = {
        {0xb3, 0x08, 0x01, 0xcc},
        {0xb3, 0x09, 0x0c, 0xcc},
        {0xb3, 0x34, 0x02, 0xcc},
-       {0xb3, 0x35, 0xc8, 0xcc},
+       {0xb3, 0x35, 0xc8, 0xcc},       /* i2c add: 48 */
        {0xb3, 0x02, 0x00, 0xcc},
        {0xb3, 0x03, 0x0a, 0xcc},
        {0xb3, 0x04, 0x05, 0xcc},
@@ -948,7 +1130,7 @@ static const u8 mi1320_soc_InitVGA[][4] = {
        {0x07, 0x00, 0xe0, 0xbb},
        {0x08, 0x00, 0x0b, 0xbb},
        {0x21, 0x00, 0x0c, 0xbb},
-       {0x20, 0x01, 0x03, 0xbb},
+       {0x20, 0x01, 0x03, 0xbb},       /* h/v flip */
        {0xbf, 0xc0, 0x26, 0xcc},
        {0xbf, 0xc1, 0x02, 0xcc},
        {0xbf, 0xcc, 0x04, 0xcc},
@@ -958,7 +1140,7 @@ static const u8 mi1320_soc_InitVGA[][4] = {
        {0x06, 0x00, 0x11, 0xbb},
        {0x07, 0x01, 0x42, 0xbb},
        {0x08, 0x00, 0x11, 0xbb},
-       {0x20, 0x01, 0x03, 0xbb},
+       {0x20, 0x01, 0x03, 0xbb},       /* h/v flip */
        {0x21, 0x80, 0x00, 0xbb},
        {0x22, 0x0d, 0x0f, 0xbb},
        {0x24, 0x80, 0x00, 0xbb},
@@ -1051,7 +1233,7 @@ static const u8 mi1320_soc_InitQVGA[][4] = {
        {0x07, 0x00, 0xe0, 0xbb},
        {0x08, 0x00, 0x0b, 0xbb},
        {0x21, 0x00, 0x0c, 0xbb},
-       {0x20, 0x01, 0x03, 0xbb},
+       {0x20, 0x01, 0x03, 0xbb},       /* h/v flip */
        {0xbf, 0xc0, 0x26, 0xcc},
        {0xbf, 0xc1, 0x02, 0xcc},
        {0xbf, 0xcc, 0x04, 0xcc},
@@ -1071,7 +1253,7 @@ static const u8 mi1320_soc_InitQVGA[][4] = {
        {0x06, 0x00, 0x11, 0xbb},
        {0x07, 0x01, 0x42, 0xbb},
        {0x08, 0x00, 0x11, 0xbb},
-       {0x20, 0x01, 0x03, 0xbb},
+       {0x20, 0x01, 0x03, 0xbb},       /* h/v flip */
        {0x21, 0x80, 0x00, 0xbb},
        {0x22, 0x0d, 0x0f, 0xbb},
        {0x24, 0x80, 0x00, 0xbb},
@@ -1161,7 +1343,7 @@ static const u8 mi1320_soc_InitSXGA[][4] = {
        {0x00, 0x00, 0x20, 0xdd},
        {0xf0, 0x00, 0x00, 0xbb},
        {0x00, 0x00, 0x30, 0xdd},
-       {0x20, 0x01, 0x03, 0xbb},
+       {0x20, 0x01, 0x03, 0xbb},       /* h/v flip */
        {0x00, 0x00, 0x20, 0xdd},
        {0xbf, 0xc0, 0x26, 0xcc},
        {0xbf, 0xc1, 0x02, 0xcc},
@@ -1172,7 +1354,7 @@ static const u8 mi1320_soc_InitSXGA[][4] = {
        {0x06, 0x00, 0x11, 0xbb},
        {0x07, 0x01, 0x42, 0xbb},
        {0x08, 0x00, 0x11, 0xbb},
-       {0x20, 0x01, 0x03, 0xbb},
+       {0x20, 0x01, 0x03, 0xbb},       /* h/v flip */
        {0x21, 0x80, 0x00, 0xbb},
        {0x22, 0x0d, 0x0f, 0xbb},
        {0x24, 0x80, 0x00, 0xbb},
@@ -1230,7 +1412,7 @@ static const u8 mi1320_soc_InitSXGA[][4] = {
        {0x06, 0x00, 0x11, 0xbb},
        {0x07, 0x00, 0x85, 0xbb},
        {0x08, 0x00, 0x27, 0xbb},
-       {0x20, 0x01, 0x03, 0xbb},
+       {0x20, 0x01, 0x03, 0xbb},       /* h/v flip */
        {0x21, 0x80, 0x00, 0xbb},
        {0x22, 0x0d, 0x0f, 0xbb},
        {0x24, 0x80, 0x00, 0xbb},
@@ -1249,15 +1431,15 @@ static const u8 mi1320_soc_InitSXGA[][4] = {
        {0x64, 0x5e, 0x1c, 0xbb},
        {}
 };
-static const __u8 po3130_gamma[17] = {
+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},
@@ -1269,7 +1451,8 @@ static const __u8 po3130_initVGA_data[][4] = {
        {0xb3, 0x23, 0xe8, 0xcc},       {0xb8, 0x08, 0xe8, 0xcc},
        {0xb3, 0x14, 0x00, 0xcc},       {0xb3, 0x15, 0x00, 0xcc},
        {0xb3, 0x16, 0x02, 0xcc},       {0xb3, 0x17, 0x7f, 0xcc},
-       {0xb3, 0x34, 0x01, 0xcc},       {0xb3, 0x35, 0xf6, 0xcc},
+       {0xb3, 0x34, 0x01, 0xcc},
+       {0xb3, 0x35, 0xf6, 0xcc},       /* i2c add: 76 */
        {0xb3, 0x00, 0x27, 0xcc},       {0xbc, 0x00, 0x71, 0xcc},
        {0xb8, 0x00, 0x21, 0xcc},       {0xb8, 0x27, 0x20, 0xcc},
        {0xb8, 0x01, 0x79, 0xcc},       {0xb8, 0x81, 0x09, 0xcc},
@@ -1340,7 +1523,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},
@@ -1355,7 +1538,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},
@@ -1441,121 +1624,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},       /* i2c add: 11 */
+       {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},
@@ -1571,7 +1840,8 @@ static const __u8 ov7660_initVGA_data[][4] = {
        {0xb3, 0x23, 0xe0, 0xcc},       {0xb3, 0x1d, 0x01, 0xcc},
        {0xb3, 0x1f, 0x02, 0xcc},
        {0xb3, 0x34, 0x01, 0xcc},
-       {0xb3, 0x35, 0xa1, 0xcc},       {0xb3, 0x00, 0x26, 0xcc},
+       {0xb3, 0x35, 0xa1, 0xcc},       /* i2c add: 21 */
+       {0xb3, 0x00, 0x26, 0xcc},
        {0xb8, 0x00, 0x33, 0xcc}, /* 13 */
        {0xb8, 0x01, 0x7d, 0xcc},
        {0xbc, 0x00, 0x73, 0xcc},       {0xb8, 0x81, 0x09, 0xcc},
@@ -1613,7 +1883,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},
@@ -1682,32 +1952,33 @@ static const __u8 ov7660_initQVGA_data[][4] = {
        {}
 };
 
-static const __u8 ov7660_50HZ[][4] = {
+static const u8 ov7660_50HZ[][4] = {
        {0x00, 0x3b, 0x08, 0xaa},
        {0x00, 0x9d, 0x40, 0xaa},
        {0x00, 0x13, 0xa7, 0xaa},
        {}
 };
 
-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},
        {0xb0, 0x04, 0x02, 0xcc},       {0x00, 0x00, 0x10, 0xdd},
        {0xb3, 0x00, 0x66, 0xcc},       {0xb3, 0x00, 0x67, 0xcc},
-       {0xb3, 0x35, 0xa1, 0xcc},       {0xb3, 0x34, 0x01, 0xcc},
+       {0xb3, 0x35, 0xa1, 0xcc},       /* i2c add: 21 */
+       {0xb3, 0x34, 0x01, 0xcc},
        {0xb3, 0x05, 0x01, 0xcc},       {0xb3, 0x06, 0x01, 0xcc},
        {0xb3, 0x08, 0x01, 0xcc},       {0xb3, 0x09, 0x0c, 0xcc},
        {0xb3, 0x02, 0x02, 0xcc},       {0xb3, 0x03, 0x1f, 0xcc},
@@ -1831,7 +2102,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},
@@ -1966,14 +2237,14 @@ static const __u8 ov7670_initQVGA_JPG[][4] = {
 };
 
 /* PO1200 - values from usbvm326.inf and ms-win trace */
-static const __u8 po1200_gamma[17] = {
+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] = {
+static const u8 po1200_matrix[9] = {
        0x60, 0xf9, 0xe5, 0xe7, 0x50, 0x05, 0xf3, 0xe6, 0x5e
 };
-static const __u8 po1200_initVGA_data[][4] = {
+static const u8 po1200_initVGA_data[][4] = {
        {0xb0, 0x03, 0x19, 0xcc},       /* reset? */
        {0xb0, 0x03, 0x19, 0xcc},
 /*     {0x00, 0x00, 0x33, 0xdd}, */
@@ -2005,7 +2276,7 @@ static const __u8 po1200_initVGA_data[][4] = {
        {0xb0, 0x54, 0x13, 0xcc},
        {0xb3, 0x00, 0x67, 0xcc},
        {0xb3, 0x34, 0x01, 0xcc},
-       {0xb3, 0x35, 0xdc, 0xcc},
+       {0xb3, 0x35, 0xdc, 0xcc},       /* i2c add: 5c */
        {0x00, 0x03, 0x00, 0xaa},
        {0x00, 0x12, 0x05, 0xaa},
        {0x00, 0x13, 0x02, 0xaa},
@@ -2232,6 +2503,251 @@ static const __u8 po1200_initVGA_data[][4] = {
        {0x00, 0xb6, 0x39, 0xaa},
        {0x00, 0xb7, 0x24, 0xaa},
 /*write 89 0400 1415*/
+       {}
+};
+
+static const u8 poxxxx_init_common[][4] = {
+       {0xb3, 0x00, 0x04, 0xcc},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0xb3, 0x00, 0x64, 0xcc},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0xb3, 0x00, 0x65, 0xcc},
+       {0x00, 0x00, 0x10, 0xdd},
+       {0xb3, 0x00, 0x67, 0xcc},
+       {0xb0, 0x03, 0x09, 0xcc},
+       {0xb3, 0x05, 0x00, 0xcc},
+       {0xb3, 0x06, 0x00, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {0xb3, 0x08, 0x01, 0xcc},
+       {0xb3, 0x09, 0x0c, 0xcc},
+       {0xb3, 0x34, 0x01, 0xcc},
+       {0xb3, 0x35, 0xf6, 0xcc},       /* i2c add: 76 */
+       {0xb3, 0x02, 0xb0, 0xcc},
+       {0xb3, 0x03, 0x18, 0xcc},
+       {0xb3, 0x04, 0x15, 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, 0x2c, 0x03, 0xcc},
+       {0xb3, 0x2d, 0x56, 0xcc},
+       {0xb3, 0x2e, 0x02, 0xcc},
+       {0xb3, 0x2f, 0x0a, 0xcc},
+       {0xb3, 0x40, 0x00, 0xcc},
+       {0xb3, 0x41, 0x34, 0xcc},
+       {0xb3, 0x42, 0x01, 0xcc},
+       {0xb3, 0x43, 0xe0, 0xcc},
+       {0xbc, 0x00, 0x71, 0xcc},
+       {0xbc, 0x01, 0x01, 0xcc},
+       {0xb3, 0x01, 0x41, 0xcc},
+       {0xb3, 0x4d, 0x00, 0xcc},
+       {0x00, 0x0b, 0x2a, 0xaa},
+       {0x00, 0x0e, 0x03, 0xaa},
+       {0x00, 0x0f, 0xea, 0xaa},
+       {0x00, 0x12, 0x08, 0xaa},
+       {0x00, 0x1e, 0x06, 0xaa},
+       {0x00, 0x21, 0x00, 0xaa},
+       {0x00, 0x31, 0x1f, 0xaa},
+       {0x00, 0x33, 0x38, 0xaa},
+       {0x00, 0x36, 0xc0, 0xaa},
+       {0x00, 0x37, 0xc8, 0xaa},
+       {0x00, 0x3b, 0x36, 0xaa},
+       {0x00, 0x4b, 0xfe, 0xaa},
+       {0x00, 0x4d, 0x2e, 0xaa},
+       {0x00, 0x51, 0x1c, 0xaa},
+       {0x00, 0x52, 0x01, 0xaa},
+       {0x00, 0x55, 0x0a, 0xaa},
+       {0x00, 0x56, 0x0a, 0xaa},
+       {0x00, 0x57, 0x07, 0xaa},
+       {0x00, 0x58, 0x07, 0xaa},
+       {0x00, 0x59, 0x04, 0xaa},
+       {0x00, 0x70, 0x68, 0xaa},
+       {0x00, 0x71, 0x04, 0xaa},
+       {0x00, 0x72, 0x10, 0xaa},
+       {0x00, 0x80, 0x71, 0xaa},
+       {0x00, 0x81, 0x08, 0xaa},
+       {0x00, 0x82, 0x00, 0xaa},
+       {0x00, 0x83, 0x55, 0xaa},
+       {0x00, 0x84, 0x06, 0xaa},
+       {0x00, 0x85, 0x06, 0xaa},
+       {0x00, 0x8b, 0x25, 0xaa},
+       {0x00, 0x8c, 0x00, 0xaa},
+       {0x00, 0x8d, 0x86, 0xaa},
+       {0x00, 0x8e, 0x82, 0xaa},
+       {0x00, 0x8f, 0x2d, 0xaa},
+       {0x00, 0x90, 0x8b, 0xaa},
+       {0x00, 0x91, 0x81, 0xaa},
+       {0x00, 0x92, 0x81, 0xaa},
+       {0x00, 0x93, 0x23, 0xaa},
+       {0x00, 0xa3, 0x2a, 0xaa},
+       {0x00, 0xa4, 0x03, 0xaa},
+       {0x00, 0xa5, 0xea, 0xaa},
+       {0x00, 0xb0, 0x68, 0xaa},
+       {0x00, 0xbc, 0x04, 0xaa},
+       {0x00, 0xbe, 0x3b, 0xaa},
+       {0x00, 0x4e, 0x40, 0xaa},
+       {0x00, 0x06, 0x04, 0xaa},
+       {0x00, 0x07, 0x03, 0xaa},
+       {0x00, 0xcd, 0x18, 0xaa},
+       {0x00, 0x28, 0x03, 0xaa},
+       {0x00, 0x29, 0xef, 0xaa},
+/* reinit on alt 2 (qvga) or alt7 (vga) */
+       {0xb3, 0x05, 0x00, 0xcc},
+       {0xb3, 0x06, 0x00, 0xcc},
+       {0xb8, 0x00, 0x01, 0xcc},
+
+       {0x00, 0x1d, 0x85, 0xaa},
+       {0x00, 0x1e, 0xc6, 0xaa},
+       {0x00, 0x00, 0x40, 0xdd},
+       {0x00, 0x1d, 0x05, 0xaa},
+
+       {0x00, 0xd6, 0x22, 0xaa},       /* gamma 0 */
+       {0x00, 0x73, 0x00, 0xaa},
+       {0x00, 0x74, 0x0a, 0xaa},
+       {0x00, 0x75, 0x16, 0xaa},
+       {0x00, 0x76, 0x25, 0xaa},
+       {0x00, 0x77, 0x34, 0xaa},
+       {0x00, 0x78, 0x49, 0xaa},
+       {0x00, 0x79, 0x5a, 0xaa},
+       {0x00, 0x7a, 0x7f, 0xaa},
+       {0x00, 0x7b, 0x9b, 0xaa},
+       {0x00, 0x7c, 0xba, 0xaa},
+       {0x00, 0x7d, 0xd4, 0xaa},
+       {0x00, 0x7e, 0xea, 0xaa},
+
+       {0x00, 0xd6, 0x62, 0xaa},       /* gamma 1 */
+       {0x00, 0x73, 0x00, 0xaa},
+       {0x00, 0x74, 0x0a, 0xaa},
+       {0x00, 0x75, 0x16, 0xaa},
+       {0x00, 0x76, 0x25, 0xaa},
+       {0x00, 0x77, 0x34, 0xaa},
+       {0x00, 0x78, 0x49, 0xaa},
+       {0x00, 0x79, 0x5a, 0xaa},
+       {0x00, 0x7a, 0x7f, 0xaa},
+       {0x00, 0x7b, 0x9b, 0xaa},
+       {0x00, 0x7c, 0xba, 0xaa},
+       {0x00, 0x7d, 0xd4, 0xaa},
+       {0x00, 0x7e, 0xea, 0xaa},
+
+       {0x00, 0xd6, 0xa2, 0xaa},       /* gamma 2 */
+       {0x00, 0x73, 0x00, 0xaa},
+       {0x00, 0x74, 0x0a, 0xaa},
+       {0x00, 0x75, 0x16, 0xaa},
+       {0x00, 0x76, 0x25, 0xaa},
+       {0x00, 0x77, 0x34, 0xaa},
+       {0x00, 0x78, 0x49, 0xaa},
+       {0x00, 0x79, 0x5a, 0xaa},
+       {0x00, 0x7a, 0x7f, 0xaa},
+       {0x00, 0x7b, 0x9b, 0xaa},
+       {0x00, 0x7c, 0xba, 0xaa},
+       {0x00, 0x7d, 0xd4, 0xaa},
+       {0x00, 0x7e, 0xea, 0xaa},
+
+       {0x00, 0xaa, 0xff, 0xaa},       /* back light comp */
+       {0x00, 0xc4, 0x03, 0xaa},
+       {0x00, 0xc5, 0x19, 0xaa},
+       {0x00, 0xc6, 0x03, 0xaa},
+       {0x00, 0xc7, 0x91, 0xaa},
+       {0x00, 0xc8, 0x01, 0xaa},
+       {0x00, 0xc9, 0xdd, 0xaa},
+       {0x00, 0xca, 0x02, 0xaa},
+       {0x00, 0xcb, 0x37, 0xaa},
+
+/* read d1 */
+       {0x00, 0xd1, 0x3c, 0xaa},
+       {0x00, 0xb8, 0x28, 0xaa},
+       {0x00, 0xb9, 0x1e, 0xaa},
+       {0x00, 0xb6, 0x14, 0xaa},
+       {0x00, 0xb7, 0x0f, 0xaa},
+       {0x00, 0x5c, 0x10, 0xaa},
+       {0x00, 0x5d, 0x18, 0xaa},
+       {0x00, 0x5e, 0x24, 0xaa},
+       {0x00, 0x5f, 0x24, 0xaa},
+       {0x00, 0x86, 0x1a, 0xaa},
+       {0x00, 0x60, 0x00, 0xaa},
+       {0x00, 0x61, 0x1b, 0xaa},
+       {0x00, 0x62, 0x30, 0xaa},
+       {0x00, 0x63, 0x40, 0xaa},
+       {0x00, 0x87, 0x1a, 0xaa},
+       {0x00, 0x64, 0x00, 0xaa},
+       {0x00, 0x65, 0x08, 0xaa},
+       {0x00, 0x66, 0x10, 0xaa},
+       {0x00, 0x67, 0x20, 0xaa},
+       {0x00, 0x88, 0x10, 0xaa},
+       {0x00, 0x68, 0x00, 0xaa},
+       {0x00, 0x69, 0x08, 0xaa},
+       {0x00, 0x6a, 0x0f, 0xaa},
+       {0x00, 0x6b, 0x0f, 0xaa},
+       {0x00, 0x89, 0x07, 0xaa},
+       {0x00, 0xd5, 0x4c, 0xaa},
+       {0x00, 0x0a, 0x00, 0xaa},
+       {0x00, 0x0b, 0x2a, 0xaa},
+       {0x00, 0x0e, 0x03, 0xaa},
+       {0x00, 0x0f, 0xea, 0xaa},
+       {0x00, 0xa2, 0x00, 0xaa},
+       {0x00, 0xa3, 0x2a, 0xaa},
+       {0x00, 0xa4, 0x03, 0xaa},
+       {0x00, 0xa5, 0xea, 0xaa},
+       {}
+};
+static const u8 poxxxx_initVGA[][4] = {
+       {0x00, 0x20, 0x11, 0xaa},
+       {0x00, 0x33, 0x38, 0xaa},
+       {0x00, 0xbb, 0x0d, 0xaa},
+       {0xb3, 0x22, 0x01, 0xcc},
+       {0xb3, 0x23, 0xe0, 0xcc},
+       {0xb3, 0x16, 0x02, 0xcc},
+       {0xb3, 0x17, 0x7f, 0xcc},
+       {0xb3, 0x02, 0xb0, 0xcc},
+       {0xb3, 0x06, 0x00, 0xcc},
+       {0xb3, 0x5c, 0x01, 0xcc},
+       {0x00, 0x04, 0x06, 0xaa},
+       {0x00, 0x05, 0x3f, 0xaa},
+       {0x00, 0x04, 0x00, 0xdd},       /* delay 1s */
+       {}
+};
+static const u8 poxxxx_initQVGA[][4] = {
+       {0x00, 0x20, 0x33, 0xaa},
+       {0x00, 0x33, 0x38, 0xaa},
+       {0x00, 0xbb, 0x0d, 0xaa},
+       {0xb3, 0x22, 0x00, 0xcc},
+       {0xb3, 0x23, 0xf0, 0xcc},
+       {0xb3, 0x16, 0x01, 0xcc},
+       {0xb3, 0x17, 0x3f, 0xcc},
+       {0xb3, 0x02, 0xb0, 0xcc},
+       {0xb3, 0x06, 0x01, 0xcc},
+       {0xb3, 0x5c, 0x00, 0xcc},
+       {0x00, 0x04, 0x06, 0xaa},
+       {0x00, 0x05, 0x3f, 0xaa},
+       {0x00, 0x04, 0x00, 0xdd},       /* delay 1s */
+       {}
+};
+static const u8 poxxxx_init_end_1[][4] = {
+       {0x00, 0x47, 0x25, 0xaa},
+       {0x00, 0x48, 0x80, 0xaa},
+       {0x00, 0x49, 0x1f, 0xaa},
+       {0x00, 0x4a, 0x40, 0xaa},
+       {0x00, 0x44, 0x40, 0xaa},
+       {0x00, 0xab, 0x4a, 0xaa},
+       {0x00, 0xb1, 0x00, 0xaa},
+       {0x00, 0xb2, 0x04, 0xaa},
+       {0x00, 0xb3, 0x08, 0xaa},
+       {0x00, 0xb4, 0x0b, 0xaa},
+       {0x00, 0xb5, 0x0d, 0xaa},
+       {0x00, 0x59, 0x7e, 0xaa},       /* sharpness */
+       {0x00, 0x16, 0x00, 0xaa},       /* white balance */
+       {0x00, 0x18, 0x00, 0xaa},
+       {}
+};
+static const u8 poxxxx_init_end_2[][4] = {
+       {0x00, 0x1d, 0x85, 0xaa},
+       {0x00, 0x1e, 0x06, 0xaa},
+       {0x00, 0x1d, 0x05, 0xaa},
+       {}
 };
 
 struct sensor_info {
@@ -2244,41 +2760,97 @@ struct sensor_info {
        u8 op;
 };
 
-static const struct sensor_info sensor_info_data[] = {
-/*      sensorId,         I2cAdd,      IdAdd,  VpId,  m1,    m2,  op */
+/* probe values */
+static const struct sensor_info vc0321_probe_data[] = {
+/*      sensorId,         I2cAdd,      IdAdd,  VpId,  m1,    m2,  op */
+/* 0 OV9640 */
        {-1,                0x80 | 0x30, 0x0a, 0x0000, 0x25, 0x24, 0x05},
+/* 1 ICM108T (may respond on IdAdd == 0x83 - tested in vc032x_probe_sensor) */
        {-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},
+/* 2 PO2130 (may detect PO3130NC - tested in vc032x_probe_sensor)*/
+       {-1,                0x80 | 0x76, 0x00, 0x0000, 0x24, 0x25, 0x01},
+/* 3 MI1310 */
+       {-1,                0x80 | 0x5d, 0x00, 0x0000, 0x24, 0x25, 0x01},
+/* 4 MI360 - tested in vc032x_probe_sensor */
+/*     {SENSOR_MI0360,     0x80 | 0x5d, 0x00, 0x8243, 0x24, 0x25, 0x01}, */
+/* 5 7131R */
+       {SENSOR_HV7131R,    0x80 | 0x11, 0x00, 0x0209, 0x24, 0x25, 0x01},
+/* 6 OV7649 */
+       {-1,                0x80 | 0x21, 0x0a, 0x0000, 0x21, 0x20, 0x05},
+/* 7 PAS302BCW */
+       {-1,                0x80 | 0x40, 0x00, 0x0000, 0x20, 0x22, 0x05},
+/* 8 OV7660 */
+       {SENSOR_OV7660,     0x80 | 0x21, 0x0a, 0x7660, 0x26, 0x26, 0x05},
+/* 9 PO3130NC - (tested in vc032x_probe_sensor) */
+/*     {SENSOR_PO3130NC,   0x80 | 0x76, 0x00, 0x3130, 0x24, 0x25, 0x01}, */
+/* 10 PO1030KC */
+       {-1,                0x80 | 0x6e, 0x00, 0x0000, 0x24, 0x25, 0x01},
+/* 11 MI1310_SOC */
        {SENSOR_MI1310_SOC, 0x80 | 0x5d, 0x00, 0x143a, 0x24, 0x25, 0x01},
-/* (tested in vc032x_probe_sensor) */
+/* 12 OV9650 */
+       {-1,                0x80 | 0x30, 0x0a, 0x0000, 0x25, 0x24, 0x05},
+/* 13 S5K532 */
+       {-1,                0x80 | 0x11, 0x39, 0x0000, 0x24, 0x25, 0x01},
+/* 14 MI360_SOC - ??? */
+/* 15 PO1200N */
+       {SENSOR_PO1200,     0x80 | 0x5c, 0x00, 0x1200, 0x67, 0x67, 0x01},
+/* 16 PO3030K */
+       {-1,                0x80 | 0x18, 0x00, 0x0000, 0x24, 0x25, 0x01},
+/* 17 PO2030 */
+       {-1,                0x80 | 0x6e, 0x00, 0x0000, 0x24, 0x25, 0x01},
+/* ?? */
+       {-1,                0x80 | 0x56, 0x01, 0x0000, 0x64, 0x67, 0x01},
+       {SENSOR_MI1320,     0x80 | 0x48, 0x00, 0x148c, 0x64, 0x65, 0x01},
+};
+static const struct sensor_info vc0323_probe_data[] = {
+/*      sensorId,         I2cAdd,      IdAdd,  VpId,  m1,    m2,  op */
+/* 0 OV9640 */
+       {-1,                0x80 | 0x30, 0x0a, 0x0000, 0x25, 0x24, 0x05},
+/* 1 ICM108T (may respond on IdAdd == 0x83 - tested in vc032x_probe_sensor) */
+       {-1,                0x80 | 0x20, 0x82, 0x0000, 0x24, 0x25, 0x01},
+/* 2 PO2130 (may detect PO3130NC - tested in vc032x_probe_sensor)*/
+       {-1,                0x80 | 0x76, 0x00, 0x0000, 0x24, 0x25, 0x01},
+/* 3 MI1310 */
+       {-1,                0x80 | 0x5d, 0x00, 0x0000, 0x24, 0x25, 0x01},
+/* 4 MI360 - tested in vc032x_probe_sensor */
 /*     {SENSOR_MI0360,     0x80 | 0x5d, 0x00, 0x8243, 0x24, 0x25, 0x01}, */
+/* 5 7131R */
        {SENSOR_HV7131R,    0x80 | 0x11, 0x00, 0x0209, 0x24, 0x25, 0x01},
+/* 6 OV7649 */
        {-1,                0x80 | 0x21, 0x0a, 0x0000, 0x21, 0x20, 0x05},
+/* 7 PAS302BCW */
        {-1,                0x80 | 0x40, 0x00, 0x0000, 0x20, 0x22, 0x05},
+/* 8 OV7660 */
        {SENSOR_OV7660,     0x80 | 0x21, 0x0a, 0x7660, 0x26, 0x26, 0x05},
-/*     {SENSOR_PO3130NC,   0x80 | 0x76, 0x00, 0x0000, 0x24, 0x25, 0x01}, */
+/* 9 PO3130NC - (tested in vc032x_probe_sensor) */
+/*     {SENSOR_PO3130NC,   0x80 | 0x76, 0x00, 0x3130, 0x24, 0x25, 0x01}, */
+/* 10 PO1030KC */
        {-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}, */
+/* 11 MI1310_SOC */
+       {SENSOR_MI1310_SOC, 0x80 | 0x5d, 0x00, 0x143a, 0x24, 0x25, 0x01},
+/* 12 OV9650 */
+       {-1,                0x80 | 0x30, 0x0a, 0x0000, 0x25, 0x24, 0x05},
+/* 13 S5K532 */
        {-1,                0x80 | 0x11, 0x39, 0x0000, 0x24, 0x25, 0x01},
+/* 14 MI360_SOC - ??? */
+/* 15 PO1200N */
        {SENSOR_PO1200,     0x80 | 0x5c, 0x00, 0x1200, 0x67, 0x67, 0x01},
+/* 16 ?? */
        {-1,                0x80 | 0x2d, 0x00, 0x0000, 0x65, 0x67, 0x01},
+/* 17 PO2030 */
        {-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?*/
+/*fixme: not in the ms-win probe - may be found before? */
        {SENSOR_OV7670,     0x80 | 0x21, 0x0a, 0x7673, 0x66, 0x67, 0x05},
 };
 
 /* read 'len' bytes in gspca_dev->usb_buf */
 static void reg_r(struct gspca_dev *gspca_dev,
-                 __u16 req,
-                 __u16 index,
-                 __u16 len)
+                 u16 req,
+                 u16 index,
+                 u16 len)
 {
        usb_control_msg(gspca_dev->dev,
                        usb_rcvctrlpipe(gspca_dev->dev, 0),
@@ -2290,9 +2862,9 @@ static void reg_r(struct gspca_dev *gspca_dev,
 }
 
 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),
@@ -2342,15 +2914,29 @@ static u16 read_sensor_register(struct gspca_dev *gspca_dev,
 
 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;
+       int i, n;
        u16 value;
        const struct sensor_info *ptsensor_info;
 
+/*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];
+       PDEBUG(D_PROBE, "vc032%d check sensor header %02x",
+               sd->bridge == BRIDGE_VC0321 ? 1 : 3, gspca_dev->usb_buf[0]);
+       if (sd->bridge == BRIDGE_VC0321) {
+               ptsensor_info = vc0321_probe_data;
+               n = ARRAY_SIZE(vc0321_probe_data);
+       } else {
+               ptsensor_info = vc0323_probe_data;
+               n = ARRAY_SIZE(vc0323_probe_data);
+       }
+       for (i = 0; i < n; i++) {
                reg_w(dev, 0xa0, 0x02, 0xb334);
                reg_w(dev, 0xa0, ptsensor_info->m1, 0xb300);
                reg_w(dev, 0xa0, ptsensor_info->m2, 0xb300);
@@ -2368,13 +2954,15 @@ static int vc032x_probe_sensor(struct gspca_dev *gspca_dev)
                                return ptsensor_info->sensorId;
 
                        switch (value) {
+                       case 0x3130:
+                               return SENSOR_PO3130NC;
                        case 0x7673:
                                return SENSOR_OV7670;
                        case 0x8243:
                                return SENSOR_MI0360;
                        }
-/*fixme: should return here*/
                }
+               ptsensor_info++;
        }
        return -1;
 }
@@ -2406,17 +2994,17 @@ static void i2c_write(struct gspca_dev *gspca_dev,
 }
 
 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;
@@ -2436,7 +3024,7 @@ static void usb_exchange(struct gspca_dev *gspca_dev,
                        i2c_write(gspca_dev, data[i][0], &data[i][1], 2);
                        break;
                case 0xdd:
-                       msleep(data[i][2] + 10);
+                       msleep(data[i][1] * 256 + data[i][2] + 10);
                        break;
                }
                i++;
@@ -2463,11 +3051,17 @@ static int sd_config(struct gspca_dev *gspca_dev,
                64,             /* OV7670 6 */
                128,            /* PO1200 7 */
                128,            /* PO3130NC 8 */
+               128,            /* POxxxx 9 */
        };
 
        cam = &gspca_dev->cam;
-       sd->bridge = id->driver_info;
-       sensor = vc032x_probe_sensor(gspca_dev);
+       sd->bridge = id->driver_info >> 8;
+       sd->flags = id->driver_info & 0xff;
+       if (id->idVendor == 0x046d &&
+           (id->idProduct == 0x0892 || id->idProduct == 0x0896))
+               sensor = SENSOR_POxxxx;
+       else
+               sensor = vc032x_probe_sensor(gspca_dev);
        switch (sensor) {
        case -1:
                PDEBUG(D_PROBE, "Unknown sensor...");
@@ -2500,6 +3094,9 @@ static int sd_config(struct gspca_dev *gspca_dev,
        case SENSOR_PO3130NC:
                PDEBUG(D_PROBE, "Find Sensor PO3130NC");
                break;
+       case SENSOR_POxxxx:
+               PDEBUG(D_PROBE, "Sensor POxxxx");
+               break;
        }
        sd->sensor = sensor;
 
@@ -2519,8 +3116,6 @@ static int sd_config(struct gspca_dev *gspca_dev,
                case SENSOR_MI1320_SOC:
                        cam->cam_mode = bi_mode;
                        cam->nmodes = ARRAY_SIZE(bi_mode);
-                       cam->input_flags = V4L2_IN_ST_VFLIP |
-                                          V4L2_IN_ST_HFLIP;
                        break;
                default:
                        cam->cam_mode = vc0323_mode;
@@ -2530,28 +3125,19 @@ static int sd_config(struct gspca_dev *gspca_dev,
        }
        cam->npkt = npkt[sd->sensor];
 
+       sd->brightness = BRIGHTNESS_DEF;
+       sd->contrast = CONTRAST_DEF;
+       sd->colors = COLOR_DEF;
        sd->hflip = HFLIP_DEF;
        sd->vflip = VFLIP_DEF;
-       if (sd->sensor == SENSOR_OV7670) {
-               sd->hflip = 1;
-               sd->vflip = 1;
-       }
        sd->lightfreq = FREQ_DEF;
-       if (sd->sensor != SENSOR_OV7670)
-               gspca_dev->ctrl_dis = (1 << LIGHTFREQ_IDX);
-       switch (sd->sensor) {
-       case SENSOR_OV7660:
-       case SENSOR_OV7670:
-       case SENSOR_PO1200:
-               break;
-       default:
-               gspca_dev->ctrl_dis = (1 << HFLIP_IDX)
-                                       | (1 << VFLIP_IDX);
-               break;
-       }
-
        sd->sharpness = SHARPNESS_DEF;
 
+       gspca_dev->ctrl_dis = ctrl_dis[sd->sensor];
+
+       if (sd->sensor == SENSOR_OV7670)
+               sd->flags |= FL_HFLIP | FL_VFLIP;
+
        if (sd->bridge == BRIDGE_VC0321) {
                reg_r(gspca_dev, 0x8a, 0, 3);
                reg_w(dev, 0x87, 0x00, 0x0f0f);
@@ -2565,42 +3151,99 @@ static int sd_config(struct gspca_dev *gspca_dev,
 /* this function is called at probe and resume time */
 static int sd_init(struct gspca_dev *gspca_dev)
 {
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       if (sd->sensor == SENSOR_POxxxx) {
+               reg_r(gspca_dev, 0xa1, 0xb300, 1);
+               if (gspca_dev->usb_buf[0] != 0) {
+                       reg_w(gspca_dev->dev, 0xa0, 0x26, 0xb300);
+                       reg_w(gspca_dev->dev, 0xa0, 0x04, 0xb300);
+                       reg_w(gspca_dev->dev, 0xa0, 0x00, 0xb300);
+               }
+       }
        return 0;
 }
 
-/* for OV7660 and OV7670 only */
-static void sethvflip(struct gspca_dev *gspca_dev)
+static void setbrightness(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       u8 data;
+
+       if (gspca_dev->ctrl_dis & (1 << BRIGHTNESS_IDX))
+               return;
+       data = sd->brightness;
+       if (data >= 0x80)
+               data &= 0x7f;
+       else
+               data = 0xff ^ data;
+       i2c_write(gspca_dev, 0x98, &data, 1);
+}
+
+static void setcontrast(struct gspca_dev *gspca_dev)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       if (gspca_dev->ctrl_dis & (1 << CONTRAST_IDX))
+               return;
+       i2c_write(gspca_dev, 0x99, &sd->contrast, 1);
+}
+
+static void setcolors(struct gspca_dev *gspca_dev)
 {
        struct sd *sd = (struct sd *) gspca_dev;
-       __u8 data;
+       u8 data;
 
+       if (gspca_dev->ctrl_dis & (1 << COLORS_IDX))
+               return;
+       data = sd->colors - (sd->colors >> 3) - 1;
+       i2c_write(gspca_dev, 0x94, &data, 1);
+       i2c_write(gspca_dev, 0x95, &sd->colors, 1);
+}
+
+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_OV7660:
-               data = 1;
+       case SENSOR_MI1310_SOC:
+       case SENSOR_MI1320:
+       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 = 7;
+               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;
-               i2c_write(gspca_dev, 0x03, &data, 1);
-               data = 0x80 * sd->hflip
-                       | 0x40 * sd->vflip
+               data[0] = 0;
+               i2c_write(gspca_dev, 0x03, data, 1);
+               data[0] = 0x80 * hflip
+                       | 0x40 * vflip
                        | 0x06;
-               i2c_write(gspca_dev, 0x1e, &data, 1);
-               return;
-       default:
-               return;
+               i2c_write(gspca_dev, 0x1e, data, 1);
+               break;
        }
-       data |= OV7660_MVFP_MIRROR * sd->hflip
-               | OV7660_MVFP_VFLIP * sd->vflip;
-       i2c_write(gspca_dev, OV7660_REG_MVFP, &data, 1);
 }
 
 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)
@@ -2608,26 +3251,37 @@ static void setlightfreq(struct gspca_dev *gspca_dev)
        usb_exchange(gspca_dev, ov7660_freq_tb[sd->lightfreq]);
 }
 
-/* po1200 only */
 static void setsharpness(struct gspca_dev *gspca_dev)
 {
        struct sd *sd = (struct sd *) gspca_dev;
-       __u8 data;
+       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);
+       switch (sd->sensor) {
+       case SENSOR_PO1200:
+               data = 0;
+               i2c_write(gspca_dev, 0x03, &data, 1);
+               if (sd->sharpness < 0)
+                       data = 0x6a;
+               else
+                       data = 0xb5 + sd->sharpness * 3;
+               i2c_write(gspca_dev, 0x61, &data, 1);
+               break;
+       case SENSOR_POxxxx:
+               if (sd->sharpness < 0)
+                       data = 0x7e;    /* def = max */
+               else
+                       data = 0x60 + sd->sharpness * 0x0f;
+               i2c_write(gspca_dev, 0x59, &data, 1);
+               break;
+       }
 }
 
 static int sd_start(struct gspca_dev *gspca_dev)
 {
        struct sd *sd = (struct sd *) gspca_dev;
-       const __u8 (*init)[4];
-       const __u8 *GammaT = NULL;
-       const __u8 *MatrixT = NULL;
+       const u8 (*init)[4];
+       const u8 *GammaT = NULL;
+       const u8 *MatrixT = NULL;
        int mode;
        static const u8 (*mi1320_soc_init[])[4] = {
                mi1320_soc_InitSXGA,
@@ -2635,6 +3289,13 @@ static int sd_start(struct gspca_dev *gspca_dev)
                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) {
                reg_w(gspca_dev->dev, 0xa0, 0xff, 0xbfec);
@@ -2722,12 +3383,27 @@ static int sd_start(struct gspca_dev *gspca_dev)
                usb_exchange(gspca_dev, init);
                init = po3130_rundata;
                break;
-       default:
-/*     case SENSOR_PO1200: */
+       case SENSOR_PO1200:
                GammaT = po1200_gamma;
                MatrixT = po1200_matrix;
                init = po1200_initVGA_data;
                break;
+       default:
+/*     case SENSOR_POxxxx: */
+               usb_exchange(gspca_dev, poxxxx_init_common);
+               if (mode)
+                       init = poxxxx_initQVGA;
+               else
+                       init = poxxxx_initVGA;
+               usb_exchange(gspca_dev, init);
+               reg_r(gspca_dev, 0x8c, 0x0000, 3);
+               reg_w(gspca_dev->dev, 0xa0,
+                               gspca_dev->usb_buf[2] & 1 ? 0 : 1,
+                               0xb35c);
+               msleep(300);
+/*fixme: i2c read 04 and 05*/
+               init = poxxxx_init_end_1;
+               break;
        }
        usb_exchange(gspca_dev, init);
        if (GammaT && MatrixT) {
@@ -2736,17 +3412,29 @@ static int sd_start(struct gspca_dev *gspca_dev)
                put_tab_to_reg(gspca_dev, GammaT, 17, 0xb86c);
                put_tab_to_reg(gspca_dev, MatrixT, 9, 0xb82c);
 
-               /* set the led on 0x0892 0x0896 */
-               if (sd->sensor != SENSOR_PO1200) {
-                       reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
-                       msleep(100);
-                       sethvflip(gspca_dev);
-                       setlightfreq(gspca_dev);
-               } else {
-                       setsharpness(gspca_dev);
-                       sethvflip(gspca_dev);
+               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;
                }
+               msleep(100);
+               setsharpness(gspca_dev);
+               sethvflip(gspca_dev);
+               setlightfreq(gspca_dev);
+       }
+       if (sd->sensor == SENSOR_POxxxx) {
+               setcolors(gspca_dev);
+               setbrightness(gspca_dev);
+               setcontrast(gspca_dev);
+
+               /* led on */
+               msleep(80);
+               reg_w(gspca_dev->dev, 0x89, 0xffff, 0xfdff);
+               usb_exchange(gspca_dev, poxxxx_init_end_2);
        }
        return 0;
 }
@@ -2754,8 +3442,19 @@ static int sd_start(struct gspca_dev *gspca_dev)
 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);
+       switch (sd->sensor) {
+       case SENSOR_MI1310_SOC:
+               reg_w(dev, 0x89, 0x058c, 0x00ff);
+               break;
+       case SENSOR_POxxxx:
+               return;
+       default:
+               if (!(sd->flags & FL_SAMSUNG))
+                       reg_w(dev, 0x89, 0xffff, 0xffff);
+               break;
+       }
        reg_w(dev, 0xa0, 0x01, 0xb301);
        reg_w(dev, 0xa0, 0x09, 0xb003);
 }
@@ -2764,15 +3463,25 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
 static void sd_stop0(struct gspca_dev *gspca_dev)
 {
        struct usb_device *dev = gspca_dev->dev;
+       struct sd *sd = (struct sd *) gspca_dev;
 
        if (!gspca_dev->present)
                return;
-       reg_w(dev, 0x89, 0xffff, 0xffff);
+/*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);
+
+       if (sd->sensor == SENSOR_POxxxx) {
+               reg_w(dev, 0xa0, 0x26, 0xb300);
+               reg_w(dev, 0xa0, 0x04, 0xb300);
+               reg_w(dev, 0xa0, 0x00, 0xb300);
+       }
 }
 
 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;
@@ -2780,21 +3489,83 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
        if (data[0] == 0xff && data[1] == 0xd8) {
                PDEBUG(D_PACK,
                        "vc032x header packet found len %d", len);
-               frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
-                                               data, 0);
+               gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0);
                data += sd->image_offset;
                len -= sd->image_offset;
-               gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
-                               data, len);
+               gspca_frame_add(gspca_dev, FIRST_PACKET, 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);
+       if (sd->bridge == BRIDGE_VC0321) {
+               struct gspca_frame *frame;
+               int l;
+
+               frame = gspca_get_i_frame(gspca_dev);
+               if (frame == NULL) {
+                       gspca_dev->last_packet_type = DISCARD_PACKET;
+                       return;
+               }
+               l = frame->data_end - frame->data;
+               if (len > frame->v4l2_buf.length - l)
+                       len = frame->v4l2_buf.length - l;
+       }
+       gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
+}
+
+static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->brightness = val;
+       if (gspca_dev->streaming)
+               setbrightness(gspca_dev);
+       return 0;
+}
+
+static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       *val = sd->brightness;
+       return 0;
+}
+
+static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->contrast = val;
+       if (gspca_dev->streaming)
+               setcontrast(gspca_dev);
+       return 0;
+}
+
+static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       *val = sd->contrast;
+       return 0;
+}
+
+static int sd_setcolors(struct gspca_dev *gspca_dev, __s32 val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       sd->colors = val;
+       if (gspca_dev->streaming)
+               setcolors(gspca_dev);
+       return 0;
+}
+
+static int sd_getcolors(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+
+       *val = sd->colors;
+       return 0;
 }
 
 static int sd_sethflip(struct gspca_dev *gspca_dev, __s32 val)
@@ -2872,21 +3643,14 @@ static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val)
 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;
-               default:
-/*             case 2:          * V4L2_CID_POWER_LINE_FREQUENCY_60HZ */
-                       strcpy((char *) menu->name, "60 Hz");
-                       return 0;
-               }
-               break;
+               if (menu->index >= ARRAY_SIZE(freq_nm))
+                       break;
+               strcpy((char *) menu->name, freq_nm[menu->index]);
+               return 0;
        }
        return -EINVAL;
 }
@@ -2906,19 +3670,23 @@ static const struct sd_desc sd_desc = {
 };
 
 /* -- module initialisation -- */
+#define BF(bridge, flags) \
+       .driver_info = (BRIDGE_ ## bridge << 8) \
+               | (flags)
 static const __devinitdata struct usb_device_id device_table[] = {
-       {USB_DEVICE(0x041e, 0x405b), .driver_info = BRIDGE_VC0323},
-       {USB_DEVICE(0x046d, 0x0892), .driver_info = BRIDGE_VC0321},
-       {USB_DEVICE(0x046d, 0x0896), .driver_info = BRIDGE_VC0321},
-       {USB_DEVICE(0x046d, 0x0897), .driver_info = BRIDGE_VC0321},
-       {USB_DEVICE(0x0ac8, 0x0321), .driver_info = BRIDGE_VC0321},
-       {USB_DEVICE(0x0ac8, 0x0323), .driver_info = BRIDGE_VC0323},
-       {USB_DEVICE(0x0ac8, 0x0328), .driver_info = BRIDGE_VC0321},
-       {USB_DEVICE(0x0ac8, 0xc001), .driver_info = BRIDGE_VC0321},
-       {USB_DEVICE(0x0ac8, 0xc002), .driver_info = BRIDGE_VC0321},
-       {USB_DEVICE(0x15b8, 0x6001), .driver_info = BRIDGE_VC0323},
-       {USB_DEVICE(0x15b8, 0x6002), .driver_info = BRIDGE_VC0323},
-       {USB_DEVICE(0x17ef, 0x4802), .driver_info = BRIDGE_VC0323},
+       {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);