V4L/DVB (8372): gspca: Small ov6650 fixes.

1) Don't change  the red and blue pre-gain's from their defaults
2) Actually make the powerline freq ctrl available to userspace

Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 14 insertions, 5 deletions

diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 7099c3770b3e..d34d582e5f59 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -238,8 +238,15 @@ static const __u8 ov6650_sensor_init[][8] =
         {0xd0, 0x60, 0x26, 0x01, 0x14, 0xd8, 0xa4, 0x10}, /* format out? */
         {0xd0, 0x60, 0x26, 0x01, 0x14, 0xd8, 0xa4, 0x10},
         {0xa0, 0x60, 0x30, 0x3d, 0x0A, 0xd8, 0xa4, 0x10},
-        /* Disable autobright ? */
-        {0xb0, 0x60, 0x60, 0x66, 0x68, 0xd8, 0xa4, 0x10},
+        /* Enable rgb brightness control */
+        {0xa0, 0x60, 0x61, 0x08, 0x00, 0x00, 0x00, 0x10},
+        /* HDG: Note windows uses the line below, which sets both register 0x60
+           and 0x61 I believe these registers of the ov6650 are identical as
+           those of the ov7630, because if this is true the windows settings
+           add a bit additional red gain and a lot additional blue gain, which
+           matches my findings that the windows settings make blue much too
+           blue and red a little too red.
+        {0xb0, 0x60, 0x60, 0x66, 0x68, 0xd8, 0xa4, 0x10}, */
         /* Some more unknown stuff */
         {0xa0, 0x60, 0x68, 0x04, 0x68, 0xd8, 0xa4, 0x10},
         {0xd0, 0x60, 0x17, 0x24, 0xd6, 0x04, 0x94, 0x10}, /* Clipreg */
@@ -655,7 +662,8 @@ static void setexposure(struct gspca_dev *gspca_dev)
                    tline * 4 * reg10, which explains why the reg10max we've
                    found experimentally for the ov6650 is exactly half that of
                    the ov6645. The ov7630 datasheet says the max is 0x41. */
-                const int reg10_max = (sd->sensor == SENSOR_OV6650)? 0x4d:0x41;
+                const int reg10_max = (sd->sensor == SENSOR_OV6650)
+                                ? 0x4d : 0x41;
 
                 reg11 = (60 * sd->exposure + 999) / 1000;
                 if (reg11 < 1)
@@ -715,7 +723,8 @@ static void setfreq(struct gspca_dev *gspca_dev)
                         i2c[3] = 0;
                         break;
                 case 1:                 /* 50 hz */
-                        i2c[3] = (sd->sensor == SENSOR_OV6650)? 0x4f:0x8a;
+                        i2c[3] = (sd->sensor == SENSOR_OV6650)
+                                        ? 0x4f : 0x8a;
                         break;
                 }
                 i2c[1] = sd->sensor_addr;
@@ -787,7 +796,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
                         sd->sensor = SENSOR_OV6650;
                         sd->sensor_has_gain = 1;
                         sd->sensor_addr = 0x60;
-                        sd->sd_desc.nctrls = 4;
+                        sd->sd_desc.nctrls = 5;
                         sd->sd_desc.dq_callback = do_autogain;
                         sif = 1;
                         break;