V4L/DVB (11459): gspca - m5602-po1030: Add auto white balancing control

Add a po1030 auto white balancing control that's disabled by default

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.c b/drivers/media/video/gspca/m5602/m5602_po1030.c
index 7ec3fbffc4be9d344cbffdb0f9a8dc6223d1d561..7eec6e8ca72ec8a236f0385931296e72411cca7a 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_po1030.c
+++ b/drivers/media/video/gspca/m5602/m5602_po1030.c
@@ -119,6 +119,20 @@ 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
        }
 };
 
@@ -238,6 +252,14 @@ int po1030_init(struct sd *sd)
 
        err = po1030_set_red_balance(&sd->gspca_dev,
                                      sensor_settings[BLUE_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;
+
        return err;
 }
 
@@ -425,6 +447,35 @@ int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)
        return err;
 }
 
+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_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;
+
+       sensor_settings[AUTO_WHITE_BALANCE_IDX] = val;
+
+       err = m5602_read_sensor(sd, PO1030_AUTOCTRL1, &i2c_data, 1);
+       if (err < 0)
+               return err;
+
+       i2c_data = (i2c_data & 0xfe) | (val & 0x01);
+       err = m5602_write_sensor(sd, PO1030_AUTOCTRL1, &i2c_data, 1);
+       return err;
+}
+
 void po1030_disconnect(struct sd *sd)
 {
        sd->sensor = NULL;

diff --git a/drivers/media/video/gspca/m5602/m5602_po1030.h b/drivers/media/video/gspca/m5602/m5602_po1030.h
index 013be33d1b2077221d015515a32da758c2f7c442..1260cfa6e4ef4b8f1e620a8214876dd150bf14c4 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_po1030.h
+++ b/drivers/media/video/gspca/m5602/m5602_po1030.h
@@ -162,6 +162,8 @@ int po1030_get_hflip(struct gspca_dev *gspca_dev, __s32 *val);
 int po1030_set_hflip(struct gspca_dev *gspca_dev, __s32 val);
 int po1030_get_vflip(struct gspca_dev *gspca_dev, __s32 *val);
 int po1030_set_vflip(struct gspca_dev *gspca_dev, __s32 val);
+int po1030_set_auto_white_balance(struct gspca_dev *gspca_dev, __s32 val);
+int po1030_get_auto_white_balance(struct gspca_dev *gspca_dev, __s32 *val);
 
 static const struct m5602_sensor po1030 = {
        .name = "PO1030",