Merge branches 'core/futexes' and 'core/iommu' into core/urgent
[pandora-kernel.git] / drivers / media / video / gspca / m5602 / m5602_po1030.c
index eaddf48..925b87d 100644 (file)
 
 #include "m5602_po1030.h"
 
+static int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val);
+static int po1030_set_exposure(struct gspca_dev *gspca_dev, __s32 val);
+static int po1030_get_gain(struct gspca_dev *gspca_dev, __s32 *val);
+static int po1030_set_gain(struct gspca_dev *gspca_dev, __s32 val);
+static int po1030_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val);
+static int po1030_set_red_balance(struct gspca_dev *gspca_dev, __s32 val);
+static int po1030_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val);
+static int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val);
+static int po1030_get_green_balance(struct gspca_dev *gspca_dev, __s32 *val);
+static int po1030_set_green_balance(struct gspca_dev *gspca_dev, __s32 val);
+static int po1030_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
+static int po1030_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
+static int po1030_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
+static int po1030_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
+static int po1030_set_auto_white_balance(struct gspca_dev *gspca_dev,
+                                        __s32 val);
+static int po1030_get_auto_white_balance(struct gspca_dev *gspca_dev,
+                                        __s32 *val);
+static int po1030_set_auto_exposure(struct gspca_dev *gspca_dev,
+                                        __s32 val);
+static int po1030_get_auto_exposure(struct gspca_dev *gspca_dev,
+                                        __s32 *val);
+
 static struct v4l2_pix_format po1030_modes[] = {
        {
                640,
@@ -27,11 +50,12 @@ static struct v4l2_pix_format po1030_modes[] = {
                .sizeimage = 640 * 480,
                .bytesperline = 640,
                .colorspace = V4L2_COLORSPACE_SRGB,
-               .priv = 0
+               .priv = 2
        }
 };
 
-const static struct ctrl po1030_ctrls[] = {
+static const struct ctrl po1030_ctrls[] = {
+#define GAIN_IDX 0
        {
                {
                        .id             = V4L2_CID_GAIN,
@@ -45,7 +69,9 @@ const static struct ctrl po1030_ctrls[] = {
                },
                .set = po1030_set_gain,
                .get = po1030_get_gain
-       }, {
+       },
+#define EXPOSURE_IDX 1
+       {
                {
                        .id             = V4L2_CID_EXPOSURE,
                        .type           = V4L2_CTRL_TYPE_INTEGER,
@@ -58,7 +84,9 @@ const static struct ctrl po1030_ctrls[] = {
                },
                .set = po1030_set_exposure,
                .get = po1030_get_exposure
-       }, {
+       },
+#define RED_BALANCE_IDX 2
+       {
                {
                        .id             = V4L2_CID_RED_BALANCE,
                        .type           = V4L2_CTRL_TYPE_INTEGER,
@@ -71,7 +99,9 @@ const static struct ctrl po1030_ctrls[] = {
                },
                .set = po1030_set_red_balance,
                .get = po1030_get_red_balance
-       }, {
+       },
+#define BLUE_BALANCE_IDX 3
+       {
                {
                        .id             = V4L2_CID_BLUE_BALANCE,
                        .type           = V4L2_CTRL_TYPE_INTEGER,
@@ -84,7 +114,9 @@ const static struct ctrl po1030_ctrls[] = {
                },
                .set = po1030_set_blue_balance,
                .get = po1030_get_blue_balance
-       }, {
+       },
+#define HFLIP_IDX 4
+       {
                {
                        .id             = V4L2_CID_HFLIP,
                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
@@ -96,7 +128,9 @@ const static struct ctrl po1030_ctrls[] = {
                },
                .set = po1030_set_hflip,
                .get = po1030_get_hflip
-       }, {
+       },
+#define VFLIP_IDX 5
+       {
                {
                        .id             = V4L2_CID_VFLIP,
                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
@@ -108,14 +142,58 @@ const static struct ctrl po1030_ctrls[] = {
                },
                .set = po1030_set_vflip,
                .get = po1030_get_vflip
-       }
+       },
+#define AUTO_WHITE_BALANCE_IDX 6
+       {
+               {
+                       .id             = V4L2_CID_AUTO_WHITE_BALANCE,
+                       .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                       .name           = "auto white balance",
+                       .minimum        = 0,
+                       .maximum        = 1,
+                       .step           = 1,
+                       .default_value  = 0,
+               },
+               .set = po1030_set_auto_white_balance,
+               .get = po1030_get_auto_white_balance
+       },
+#define AUTO_EXPOSURE_IDX 7
+       {
+               {
+                       .id             = V4L2_CID_EXPOSURE_AUTO,
+                       .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                       .name           = "auto exposure",
+                       .minimum        = 0,
+                       .maximum        = 1,
+                       .step           = 1,
+                       .default_value  = 0,
+               },
+               .set = po1030_set_auto_exposure,
+               .get = po1030_get_auto_exposure
+       },
+#define GREEN_BALANCE_IDX 8
+       {
+               {
+                       .id             = M5602_V4L2_CID_GREEN_BALANCE,
+                       .type           = V4L2_CTRL_TYPE_INTEGER,
+                       .name           = "green balance",
+                       .minimum        = 0x00,
+                       .maximum        = 0xff,
+                       .step           = 0x1,
+                       .default_value  = PO1030_GREEN_GAIN_DEFAULT,
+                       .flags          = V4L2_CTRL_FLAG_SLIDER
+               },
+               .set = po1030_set_green_balance,
+               .get = po1030_get_green_balance
+       },
 };
 
 static void po1030_dump_registers(struct sd *sd);
 
 int po1030_probe(struct sd *sd)
 {
-       u8 prod_id = 0, ver_id = 0, i;
+       u8 dev_id_h = 0, i;
+       s32 *sensor_settings;
 
        if (force_sensor) {
                if (force_sensor == PO1030_SENSOR) {
@@ -127,7 +205,7 @@ int po1030_probe(struct sd *sd)
                return -ENODEV;
        }
 
-       info("Probing for a po1030 sensor");
+       PDEBUG(D_PROBE, "Probing for a po1030 sensor");
 
        /* Run the pre-init to actually probe the unit */
        for (i = 0; i < ARRAY_SIZE(preinit_po1030); i++) {
@@ -139,28 +217,36 @@ int po1030_probe(struct sd *sd)
                        m5602_write_bridge(sd, preinit_po1030[i][1], data);
        }
 
-       if (m5602_read_sensor(sd, 0x3, &prod_id, 1))
+       if (m5602_read_sensor(sd, PO1030_DEVID_H, &dev_id_h, 1))
                return -ENODEV;
 
-       if (m5602_read_sensor(sd, 0x4, &ver_id, 1))
-               return -ENODEV;
-
-       if ((prod_id == 0x02) && (ver_id == 0xef)) {
+       if (dev_id_h == 0x30) {
                info("Detected a po1030 sensor");
                goto sensor_found;
        }
        return -ENODEV;
 
 sensor_found:
+       sensor_settings = kmalloc(
+               ARRAY_SIZE(po1030_ctrls) * sizeof(s32), GFP_KERNEL);
+       if (!sensor_settings)
+               return -ENOMEM;
+
        sd->gspca_dev.cam.cam_mode = po1030_modes;
        sd->gspca_dev.cam.nmodes = ARRAY_SIZE(po1030_modes);
        sd->desc->ctrls = po1030_ctrls;
        sd->desc->nctrls = ARRAY_SIZE(po1030_ctrls);
+
+       for (i = 0; i < ARRAY_SIZE(po1030_ctrls); i++)
+               sensor_settings[i] = po1030_ctrls[i].qctrl.default_value;
+       sd->sensor_priv = sensor_settings;
+
        return 0;
 }
 
 int po1030_init(struct sd *sd)
 {
+       s32 *sensor_settings = sd->sensor_priv;
        int i, err = 0;
 
        /* Init the sensor */
@@ -185,47 +271,206 @@ int po1030_init(struct sd *sd)
                        return -EINVAL;
                }
        }
+       if (err < 0)
+               return err;
 
        if (dump_sensor)
                po1030_dump_registers(sd);
 
+       err = po1030_set_exposure(&sd->gspca_dev,
+                                  sensor_settings[EXPOSURE_IDX]);
+       if (err < 0)
+               return err;
+
+       err = po1030_set_gain(&sd->gspca_dev, sensor_settings[GAIN_IDX]);
+       if (err < 0)
+               return err;
+
+       err = po1030_set_hflip(&sd->gspca_dev, sensor_settings[HFLIP_IDX]);
+       if (err < 0)
+               return err;
+
+       err = po1030_set_vflip(&sd->gspca_dev, sensor_settings[VFLIP_IDX]);
+       if (err < 0)
+               return err;
+
+       err = po1030_set_red_balance(&sd->gspca_dev,
+                                     sensor_settings[RED_BALANCE_IDX]);
+       if (err < 0)
+               return err;
+
+       err = po1030_set_blue_balance(&sd->gspca_dev,
+                                     sensor_settings[BLUE_BALANCE_IDX]);
+       if (err < 0)
+               return err;
+
+       err = po1030_set_green_balance(&sd->gspca_dev,
+                                      sensor_settings[GREEN_BALANCE_IDX]);
+       if (err < 0)
+               return err;
+
+       err = po1030_set_auto_white_balance(&sd->gspca_dev,
+                               sensor_settings[AUTO_WHITE_BALANCE_IDX]);
+       if (err < 0)
+               return err;
+
+       err = po1030_set_auto_exposure(&sd->gspca_dev,
+                               sensor_settings[AUTO_EXPOSURE_IDX]);
        return err;
 }
 
-int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
+int po1030_start(struct sd *sd)
 {
-       struct sd *sd = (struct sd *) gspca_dev;
-       u8 i2c_data;
-       int err;
+       struct cam *cam = &sd->gspca_dev.cam;
+       int i, err = 0;
+       int width = cam->cam_mode[sd->gspca_dev.curr_mode].width;
+       int height = cam->cam_mode[sd->gspca_dev.curr_mode].height;
+       int ver_offs = cam->cam_mode[sd->gspca_dev.curr_mode].priv;
+       u8 data;
+
+       switch (width) {
+       case 320:
+               data = PO1030_SUBSAMPLING;
+               err = m5602_write_sensor(sd, PO1030_CONTROL3, &data, 1);
+               if (err < 0)
+                       return err;
+
+               data = ((width + 3) >> 8) & 0xff;
+               err = m5602_write_sensor(sd, PO1030_WINDOWWIDTH_H, &data, 1);
+               if (err < 0)
+                       return err;
+
+               data = (width + 3) & 0xff;
+               err = m5602_write_sensor(sd, PO1030_WINDOWWIDTH_L, &data, 1);
+               if (err < 0)
+                       return err;
+
+               data = ((height + 1) >> 8) & 0xff;
+               err = m5602_write_sensor(sd, PO1030_WINDOWHEIGHT_H, &data, 1);
+               if (err < 0)
+                       return err;
+
+               data = (height + 1) & 0xff;
+               err = m5602_write_sensor(sd, PO1030_WINDOWHEIGHT_L, &data, 1);
+
+               height += 6;
+               width -= 1;
+               break;
+
+       case 640:
+               data = 0;
+               err = m5602_write_sensor(sd, PO1030_CONTROL3, &data, 1);
+               if (err < 0)
+                       return err;
+
+               data = ((width + 7) >> 8) & 0xff;
+               err = m5602_write_sensor(sd, PO1030_WINDOWWIDTH_H, &data, 1);
+               if (err < 0)
+                       return err;
+
+               data = (width + 7) & 0xff;
+               err = m5602_write_sensor(sd, PO1030_WINDOWWIDTH_L, &data, 1);
+               if (err < 0)
+                       return err;
+
+               data = ((height + 3) >> 8) & 0xff;
+               err = m5602_write_sensor(sd, PO1030_WINDOWHEIGHT_H, &data, 1);
+               if (err < 0)
+                       return err;
+
+               data = (height + 3) & 0xff;
+               err = m5602_write_sensor(sd, PO1030_WINDOWHEIGHT_L, &data, 1);
+
+               height += 12;
+               width -= 2;
+               break;
+       }
+       err = m5602_write_bridge(sd, M5602_XB_SENSOR_TYPE, 0x0c);
+       if (err < 0)
+               return err;
 
-       err = m5602_read_sensor(sd, PO1030_REG_INTEGLINES_H,
-                                &i2c_data, 1);
+       err = m5602_write_bridge(sd, M5602_XB_LINE_OF_FRAME_H, 0x81);
        if (err < 0)
                return err;
-       *val = (i2c_data << 8);
 
-       err = m5602_read_sensor(sd, PO1030_REG_INTEGLINES_M,
-                                &i2c_data, 1);
-       *val |= i2c_data;
+       err = m5602_write_bridge(sd, M5602_XB_PIX_OF_LINE_H, 0x82);
+       if (err < 0)
+               return err;
 
-       PDEBUG(D_V4L2, "Exposure read as %d", *val);
+       err = m5602_write_bridge(sd, M5602_XB_SIG_INI, 0x01);
+       if (err < 0)
+               return err;
+
+       err = m5602_write_bridge(sd, M5602_XB_VSYNC_PARA,
+                                ((ver_offs >> 8) & 0xff));
+       if (err < 0)
+               return err;
+
+       err = m5602_write_bridge(sd, M5602_XB_VSYNC_PARA, (ver_offs & 0xff));
+       if (err < 0)
+               return err;
+
+       for (i = 0; i < 2 && !err; i++)
+               err = m5602_write_bridge(sd, M5602_XB_VSYNC_PARA, 0);
+       if (err < 0)
+               return err;
+
+       err = m5602_write_bridge(sd, M5602_XB_VSYNC_PARA, (height >> 8) & 0xff);
+       if (err < 0)
+               return err;
+
+       err = m5602_write_bridge(sd, M5602_XB_VSYNC_PARA, (height & 0xff));
+       if (err < 0)
+               return err;
+
+       for (i = 0; i < 2 && !err; i++)
+               err = m5602_write_bridge(sd, M5602_XB_VSYNC_PARA, 0);
+
+       for (i = 0; i < 2 && !err; i++)
+               err = m5602_write_bridge(sd, M5602_XB_SIG_INI, 0);
+
+       for (i = 0; i < 2 && !err; i++)
+               err = m5602_write_bridge(sd, M5602_XB_HSYNC_PARA, 0);
+       if (err < 0)
+               return err;
+
+       err = m5602_write_bridge(sd, M5602_XB_HSYNC_PARA, (width >> 8) & 0xff);
+       if (err < 0)
+               return err;
 
+       err = m5602_write_bridge(sd, M5602_XB_HSYNC_PARA, (width & 0xff));
+       if (err < 0)
+               return err;
+
+       err = m5602_write_bridge(sd, M5602_XB_SIG_INI, 0);
        return err;
 }
 
-int po1030_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
+static int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
 {
        struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[EXPOSURE_IDX];
+       PDEBUG(D_V4L2, "Exposure read as %d", *val);
+       return 0;
+}
+
+static int po1030_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
        u8 i2c_data;
        int err;
 
+       sensor_settings[EXPOSURE_IDX] = val;
        PDEBUG(D_V4L2, "Set exposure to %d", val & 0xffff);
 
        i2c_data = ((val & 0xff00) >> 8);
        PDEBUG(D_V4L2, "Set exposure to high byte to 0x%x",
               i2c_data);
 
-       err = m5602_write_sensor(sd, PO1030_REG_INTEGLINES_H,
+       err = m5602_write_sensor(sd, PO1030_INTEGLINES_H,
                                  &i2c_data, 1);
        if (err < 0)
                return err;
@@ -233,167 +478,256 @@ int po1030_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
        i2c_data = (val & 0xff);
        PDEBUG(D_V4L2, "Set exposure to low byte to 0x%x",
               i2c_data);
-       err = m5602_write_sensor(sd, PO1030_REG_INTEGLINES_M,
+       err = m5602_write_sensor(sd, PO1030_INTEGLINES_M,
                                  &i2c_data, 1);
 
        return err;
 }
 
-int po1030_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
+static int po1030_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
 {
        struct sd *sd = (struct sd *) gspca_dev;
-       u8 i2c_data;
-       int err;
+       s32 *sensor_settings = sd->sensor_priv;
 
-       err = m5602_read_sensor(sd, PO1030_REG_GLOBALGAIN,
-                                &i2c_data, 1);
-       *val = i2c_data;
+       *val = sensor_settings[GAIN_IDX];
        PDEBUG(D_V4L2, "Read global gain %d", *val);
-
-       return err;
+       return 0;
 }
 
-int po1030_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
+static int po1030_set_gain(struct gspca_dev *gspca_dev, __s32 val)
 {
        struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
        u8 i2c_data;
        int err;
 
-       err = m5602_read_sensor(sd, PO1030_REG_CONTROL2,
+       sensor_settings[GAIN_IDX] = val;
+
+       i2c_data = val & 0xff;
+       PDEBUG(D_V4L2, "Set global gain to %d", i2c_data);
+       err = m5602_write_sensor(sd, PO1030_GLOBALGAIN,
                                 &i2c_data, 1);
+       return err;
+}
 
-       *val = (i2c_data >> 7) & 0x01 ;
+static int po1030_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
 
+       *val = sensor_settings[HFLIP_IDX];
        PDEBUG(D_V4L2, "Read hflip %d", *val);
 
-       return err;
+       return 0;
 }
 
-int po1030_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
+static int po1030_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
 {
        struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
        u8 i2c_data;
        int err;
 
+       sensor_settings[HFLIP_IDX] = val;
+
        PDEBUG(D_V4L2, "Set hflip %d", val);
-       err = m5602_read_sensor(sd, PO1030_REG_CONTROL2, &i2c_data, 1);
+       err = m5602_read_sensor(sd, PO1030_CONTROL2, &i2c_data, 1);
        if (err < 0)
                return err;
 
        i2c_data = (0x7f & i2c_data) | ((val & 0x01) << 7);
 
-       err = m5602_write_sensor(sd, PO1030_REG_CONTROL2,
+       err = m5602_write_sensor(sd, PO1030_CONTROL2,
                                 &i2c_data, 1);
 
        return err;
 }
 
-int po1030_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
+static int po1030_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
 {
        struct sd *sd = (struct sd *) gspca_dev;
-       u8 i2c_data;
-       int err;
-
-       err = m5602_read_sensor(sd, PO1030_REG_GLOBALGAIN,
-                                &i2c_data, 1);
-
-       *val = (i2c_data >> 6) & 0x01;
+       s32 *sensor_settings = sd->sensor_priv;
 
+       *val = sensor_settings[VFLIP_IDX];
        PDEBUG(D_V4L2, "Read vflip %d", *val);
 
-       return err;
+       return 0;
 }
 
-int po1030_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
+static int po1030_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
 {
        struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
        u8 i2c_data;
        int err;
 
+       sensor_settings[VFLIP_IDX] = val;
+
        PDEBUG(D_V4L2, "Set vflip %d", val);
-       err = m5602_read_sensor(sd, PO1030_REG_CONTROL2, &i2c_data, 1);
+       err = m5602_read_sensor(sd, PO1030_CONTROL2, &i2c_data, 1);
        if (err < 0)
                return err;
 
        i2c_data = (i2c_data & 0xbf) | ((val & 0x01) << 6);
 
-       err = m5602_write_sensor(sd, PO1030_REG_CONTROL2,
+       err = m5602_write_sensor(sd, PO1030_CONTROL2,
                                 &i2c_data, 1);
 
        return err;
 }
 
-int po1030_set_gain(struct gspca_dev *gspca_dev, __s32 val)
+static int po1030_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[RED_BALANCE_IDX];
+       PDEBUG(D_V4L2, "Read red gain %d", *val);
+       return 0;
+}
+
+static int po1030_set_red_balance(struct gspca_dev *gspca_dev, __s32 val)
 {
        struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
        u8 i2c_data;
        int err;
 
+       sensor_settings[RED_BALANCE_IDX] = val;
+
        i2c_data = val & 0xff;
-       PDEBUG(D_V4L2, "Set global gain to %d", i2c_data);
-       err = m5602_write_sensor(sd, PO1030_REG_GLOBALGAIN,
+       PDEBUG(D_V4L2, "Set red gain to %d", i2c_data);
+       err = m5602_write_sensor(sd, PO1030_RED_GAIN,
                                  &i2c_data, 1);
        return err;
 }
 
-int po1030_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val)
+static int po1030_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val)
 {
        struct sd *sd = (struct sd *) gspca_dev;
-       u8 i2c_data;
-       int err;
+       s32 *sensor_settings = sd->sensor_priv;
 
-       err = m5602_read_sensor(sd, PO1030_REG_RED_GAIN,
-                                &i2c_data, 1);
-       *val = i2c_data;
-       PDEBUG(D_V4L2, "Read red gain %d", *val);
-       return err;
+       *val = sensor_settings[BLUE_BALANCE_IDX];
+       PDEBUG(D_V4L2, "Read blue gain %d", *val);
+
+       return 0;
 }
 
-int po1030_set_red_balance(struct gspca_dev *gspca_dev, __s32 val)
+static int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)
 {
        struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
        u8 i2c_data;
        int err;
 
+       sensor_settings[BLUE_BALANCE_IDX] = val;
+
        i2c_data = val & 0xff;
-       PDEBUG(D_V4L2, "Set red gain to %d", i2c_data);
-       err = m5602_write_sensor(sd, PO1030_REG_RED_GAIN,
+       PDEBUG(D_V4L2, "Set blue gain to %d", i2c_data);
+       err = m5602_write_sensor(sd, PO1030_BLUE_GAIN,
                                  &i2c_data, 1);
+
        return err;
 }
 
-int po1030_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val)
+static int po1030_get_green_balance(struct gspca_dev *gspca_dev, __s32 *val)
 {
        struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[GREEN_BALANCE_IDX];
+       PDEBUG(D_V4L2, "Read green gain %d", *val);
+
+       return 0;
+}
+
+static int po1030_set_green_balance(struct gspca_dev *gspca_dev, __s32 val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
        u8 i2c_data;
        int err;
 
-       err = m5602_read_sensor(sd, PO1030_REG_BLUE_GAIN,
+       sensor_settings[GREEN_BALANCE_IDX] = val;
+       i2c_data = val & 0xff;
+       PDEBUG(D_V4L2, "Set green gain to %d", i2c_data);
+
+       err = m5602_write_sensor(sd, PO1030_GREEN_1_GAIN,
+                          &i2c_data, 1);
+       if (err < 0)
+               return err;
+
+       return m5602_write_sensor(sd, PO1030_GREEN_2_GAIN,
                                 &i2c_data, 1);
-       *val = i2c_data;
-       PDEBUG(D_V4L2, "Read blue gain %d", *val);
+}
 
-       return err;
+static int po1030_get_auto_white_balance(struct gspca_dev *gspca_dev,
+                                        __s32 *val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[AUTO_WHITE_BALANCE_IDX];
+       PDEBUG(D_V4L2, "Auto white balancing is %d", *val);
+
+       return 0;
 }
 
-int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)
+static int po1030_set_auto_white_balance(struct gspca_dev *gspca_dev,
+                                        __s32 val)
 {
        struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
        u8 i2c_data;
        int err;
-       i2c_data = val & 0xff;
-       PDEBUG(D_V4L2, "Set blue gain to %d", i2c_data);
-       err = m5602_write_sensor(sd, PO1030_REG_BLUE_GAIN,
-                                 &i2c_data, 1);
 
+       sensor_settings[AUTO_WHITE_BALANCE_IDX] = val;
+
+       err = m5602_read_sensor(sd, PO1030_AUTOCTRL1, &i2c_data, 1);
+       if (err < 0)
+               return err;
+
+       PDEBUG(D_V4L2, "Set auto white balance to %d", val);
+       i2c_data = (i2c_data & 0xfe) | (val & 0x01);
+       err = m5602_write_sensor(sd, PO1030_AUTOCTRL1, &i2c_data, 1);
        return err;
 }
 
-int po1030_power_down(struct sd *sd)
+static int po1030_get_auto_exposure(struct gspca_dev *gspca_dev,
+                                   __s32 *val)
 {
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+
+       *val = sensor_settings[AUTO_EXPOSURE_IDX];
+       PDEBUG(D_V4L2, "Auto exposure is %d", *val);
        return 0;
 }
 
+static int po1030_set_auto_exposure(struct gspca_dev *gspca_dev,
+                                   __s32 val)
+{
+       struct sd *sd = (struct sd *) gspca_dev;
+       s32 *sensor_settings = sd->sensor_priv;
+       u8 i2c_data;
+       int err;
+
+       sensor_settings[AUTO_EXPOSURE_IDX] = val;
+       err = m5602_read_sensor(sd, PO1030_AUTOCTRL1, &i2c_data, 1);
+       if (err < 0)
+               return err;
+
+       PDEBUG(D_V4L2, "Set auto exposure to %d", val);
+       i2c_data = (i2c_data & 0xfd) | ((val & 0x01) << 1);
+       return m5602_write_sensor(sd, PO1030_AUTOCTRL1, &i2c_data, 1);
+}
+
+void po1030_disconnect(struct sd *sd)
+{
+       sd->sensor = NULL;
+       kfree(sd->sensor_priv);
+}
+
 static void po1030_dump_registers(struct sd *sd)
 {
        int address;