1 files changed, 43 insertions, 20 deletions

diff --git a/drivers/media/video/sn9c102/sn9c102_ov7660.c b/drivers/media/video/sn9c102/sn9c102_ov7660.c
index c898e948fe8..4b6474048a7 100644
--- a/drivers/media/video/sn9c102/sn9c102_ov7660.c
+++ b/drivers/media/video/sn9c102/sn9c102_ov7660.c
@@ -104,8 +104,8 @@ static int ov7660_init(struct sn9c102_device* cam)
         err += sn9c102_i2c_write(cam, 0x12, 0x80);
         err += sn9c102_i2c_write(cam, 0x11, 0x09);
         err += sn9c102_i2c_write(cam, 0x00, 0x0A);
-        err += sn9c102_i2c_write(cam, 0x01, 0x78);
-        err += sn9c102_i2c_write(cam, 0x02, 0x90);
+        err += sn9c102_i2c_write(cam, 0x01, 0x80);
+        err += sn9c102_i2c_write(cam, 0x02, 0x80);
         err += sn9c102_i2c_write(cam, 0x03, 0x00);
         err += sn9c102_i2c_write(cam, 0x04, 0x00);
         err += sn9c102_i2c_write(cam, 0x05, 0x08);
@@ -122,7 +122,7 @@ static int ov7660_init(struct sn9c102_device* cam)
         err += sn9c102_i2c_write(cam, 0x10, 0x20);
         err += sn9c102_i2c_write(cam, 0x11, 0x03);
         err += sn9c102_i2c_write(cam, 0x12, 0x05);
-        err += sn9c102_i2c_write(cam, 0x13, 0xF8);
+        err += sn9c102_i2c_write(cam, 0x13, 0xC7);
         err += sn9c102_i2c_write(cam, 0x14, 0x2C);
         err += sn9c102_i2c_write(cam, 0x15, 0x00);
         err += sn9c102_i2c_write(cam, 0x16, 0x02);
@@ -162,7 +162,7 @@ static int ov7660_init(struct sn9c102_device* cam)
         err += sn9c102_i2c_write(cam, 0x38, 0x02);
         err += sn9c102_i2c_write(cam, 0x39, 0x43);
         err += sn9c102_i2c_write(cam, 0x3A, 0x00);
-        err += sn9c102_i2c_write(cam, 0x3B, 0x02);
+        err += sn9c102_i2c_write(cam, 0x3B, 0x0A);
         err += sn9c102_i2c_write(cam, 0x3C, 0x6C);
         err += sn9c102_i2c_write(cam, 0x3D, 0x99);
         err += sn9c102_i2c_write(cam, 0x3E, 0x0E);
@@ -281,25 +281,34 @@ static int ov7660_get_ctrl(struct sn9c102_device* cam,
                         return -EIO;
                 break;
         case V4L2_CID_DO_WHITE_BALANCE:
-                ctrl->value = sn9c102_pread_reg(cam, 0x02);
+                if ((ctrl->value = sn9c102_read_reg(cam, 0x02)) < 0)
+                        return -EIO;
                 ctrl->value = (ctrl->value & 0x04) ? 1 : 0;
                 break;
         case V4L2_CID_RED_BALANCE:
-                ctrl->value = sn9c102_pread_reg(cam, 0x05);
+                if ((ctrl->value = sn9c102_read_reg(cam, 0x05)) < 0)
+                        return -EIO;
                 ctrl->value &= 0x7f;
                 break;
         case V4L2_CID_BLUE_BALANCE:
-                ctrl->value = sn9c102_pread_reg(cam, 0x06);
+                if ((ctrl->value = sn9c102_read_reg(cam, 0x06)) < 0)
+                        return -EIO;
                 ctrl->value &= 0x7f;
                 break;
         case SN9C102_V4L2_CID_GREEN_BALANCE:
-                ctrl->value = sn9c102_pread_reg(cam, 0x07);
+                if ((ctrl->value = sn9c102_read_reg(cam, 0x07)) < 0)
+                        return -EIO;
                 ctrl->value &= 0x7f;
                 break;
+        case SN9C102_V4L2_CID_BAND_FILTER:
+                if ((ctrl->value = sn9c102_i2c_read(cam, 0x3b)) < 0)
+                        return -EIO;
+                ctrl->value &= 0x08;
+                break;
         case V4L2_CID_GAIN:
                 if ((ctrl->value = sn9c102_i2c_read(cam, 0x00)) < 0)
                         return -EIO;
-                ctrl->value &= 0x7f;
+                ctrl->value &= 0x1f;
                 break;
         case V4L2_CID_AUTOGAIN:
                 if ((ctrl->value = sn9c102_i2c_read(cam, 0x13)) < 0)
@@ -335,12 +344,15 @@ static int ov7660_set_ctrl(struct sn9c102_device* cam,
         case SN9C102_V4L2_CID_GREEN_BALANCE:
                 err += sn9c102_write_reg(cam, ctrl->value, 0x07);
                 break;
+        case SN9C102_V4L2_CID_BAND_FILTER:
+                err += sn9c102_i2c_write(cam, ctrl->value << 3, 0x3b);
+                break;
         case V4L2_CID_GAIN:
-                err += sn9c102_i2c_write(cam, 0x00, ctrl->value);
+                err += sn9c102_i2c_write(cam, 0x00, 0x60 + ctrl->value);
                 break;
         case V4L2_CID_AUTOGAIN:
-                err += sn9c102_i2c_write(cam, 0x13, 0xf0 | ctrl->value |
-                                                    (ctrl->value << 1));
+                err += sn9c102_i2c_write(cam, 0x13, 0xc0 |
+                                                    (ctrl->value * 0x07));
                 break;
         default:
                 return -EINVAL;
@@ -386,7 +398,7 @@ static int ov7660_set_pix_format(struct sn9c102_device* cam,
 }
 
 
-static struct sn9c102_sensor ov7660 = {
+static const struct sn9c102_sensor ov7660 = {
         .name = "OV7660",
         .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>",
         .supported_bridge = BRIDGE_SN9C105 | BRIDGE_SN9C120,
@@ -401,9 +413,9 @@ static struct sn9c102_sensor ov7660 = {
                         .type = V4L2_CTRL_TYPE_INTEGER,
                         .name = "global gain",
                         .minimum = 0x00,
-                        .maximum = 0x7f,
+                        .maximum = 0x1f,
                         .step = 0x01,
-                        .default_value = 0x0a,
+                        .default_value = 0x09,
                         .flags = 0,
                 },
                 {
@@ -413,7 +425,7 @@ static struct sn9c102_sensor ov7660 = {
                         .minimum = 0x00,
                         .maximum = 0xff,
                         .step = 0x01,
-                        .default_value = 0x50,
+                        .default_value = 0x27,
                         .flags = 0,
                 },
                 {
@@ -433,7 +445,7 @@ static struct sn9c102_sensor ov7660 = {
                         .minimum = 0x00,
                         .maximum = 0x7f,
                         .step = 0x01,
-                        .default_value = 0x1f,
+                        .default_value = 0x14,
                         .flags = 0,
                 },
                 {
@@ -443,7 +455,7 @@ static struct sn9c102_sensor ov7660 = {
                         .minimum = 0x00,
                         .maximum = 0x7f,
                         .step = 0x01,
-                        .default_value = 0x1e,
+                        .default_value = 0x14,
                         .flags = 0,
                 },
                 {
@@ -453,7 +465,7 @@ static struct sn9c102_sensor ov7660 = {
                         .minimum = 0x00,
                         .maximum = 0x01,
                         .step = 0x01,
-                        .default_value = 0x00,
+                        .default_value = 0x01,
                         .flags = 0,
                 },
                 {
@@ -463,7 +475,17 @@ static struct sn9c102_sensor ov7660 = {
                         .minimum = 0x00,
                         .maximum = 0x7f,
                         .step = 0x01,
-                        .default_value = 0x20,
+                        .default_value = 0x14,
+                        .flags = 0,
+                },
+                {
+                        .id = SN9C102_V4L2_CID_BAND_FILTER,
+                        .type = V4L2_CTRL_TYPE_BOOLEAN,
+                        .name = "band filter",
+                        .minimum = 0x00,
+                        .maximum = 0x01,
+                        .step = 0x01,
+                        .default_value = 0x00,
                         .flags = 0,
                 },
         },
@@ -508,6 +530,7 @@ int sn9c102_probe_ov7660(struct sn9c102_device* cam)
                 return -EIO;
         if (pid != 0x76 || ver != 0x60)
                 return -ENODEV;
+
         sn9c102_attach_sensor(cam, &ov7660);
 
         return 0;