1 files changed, 51 insertions, 1 deletions

diff --git a/drivers/media/video/gspca/m5602/m5602_ov7660.c b/drivers/media/video/gspca/m5602/m5602_ov7660.c
index 855c058d5df3..80c64caac353 100644
--- a/drivers/media/video/gspca/m5602/m5602_ov7660.c
+++ b/drivers/media/video/gspca/m5602/m5602_ov7660.c
@@ -30,7 +30,8 @@ static int ov7660_set_auto_white_balance(struct gspca_dev *gspca_dev,
                                          __s32 val);
 static int ov7660_get_auto_gain(struct gspca_dev *gspca_dev, __s32 *val);
 static int ov7660_set_auto_gain(struct gspca_dev *gspca_dev, __s32 val);
-
+static int ov7660_get_auto_exposure(struct gspca_dev *gspca_dev, __s32 *val);
+static int ov7660_set_auto_exposure(struct gspca_dev *gspca_dev, __s32 val);
 
 const static struct ctrl ov7660_ctrls[] = {
 #define GAIN_IDX 1
@@ -106,6 +107,20 @@ const static struct ctrl ov7660_ctrls[] = {
                 .set = ov7660_set_auto_gain,
                 .get = ov7660_get_auto_gain
         },
+#define AUTO_EXPOSURE_IDX 6
+        {
+                {
+                        .id             = V4L2_CID_EXPOSURE_AUTO,
+                        .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name           = "auto exposure",
+                        .minimum        = 0,
+                        .maximum        = 1,
+                        .step           = 1,
+                        .default_value  = 1
+                },
+                .set = ov7660_set_auto_exposure,
+                .get = ov7660_get_auto_exposure
+        }
 };
 
 static struct v4l2_pix_format ov7660_modes[] = {
@@ -227,6 +242,11 @@ int ov7660_init(struct sd *sd)
         if (err < 0)
                 return err;
 
+        err = ov7660_set_auto_exposure(&sd->gspca_dev,
+                sensor_settings[AUTO_EXPOSURE_IDX]);
+        if (err < 0)
+                return err;
+
         err = ov7660_set_blue_gain(&sd->gspca_dev,
                 sensor_settings[BLUE_BALANCE_IDX]);
         if (err < 0)
@@ -391,6 +411,36 @@ static int ov7660_set_auto_gain(struct gspca_dev *gspca_dev, __s32 val)
         return m5602_write_sensor(sd, OV7660_COM8, &i2c_data, 1);
 }
 
+static int ov7660_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, "Read auto exposure control %d", *val);
+        return 0;
+}
+
+static int ov7660_set_auto_exposure(struct gspca_dev *gspca_dev,
+                                    __s32 val)
+{
+        int err;
+        u8 i2c_data;
+        struct sd *sd = (struct sd *) gspca_dev;
+        s32 *sensor_settings = sd->sensor_priv;
+
+        PDEBUG(D_V4L2, "Set auto exposure control to %d", val);
+
+        sensor_settings[AUTO_EXPOSURE_IDX] = val;
+        err = m5602_read_sensor(sd, OV7660_COM8, &i2c_data, 1);
+        if (err < 0)
+                return err;
+
+        i2c_data = ((i2c_data & 0xfe) | ((val & 0x01) << 0));
+
+        return m5602_write_sensor(sd, OV7660_COM8, &i2c_data, 1);
+}
+
 static void ov7660_dump_registers(struct sd *sd)
 {
         int address;