Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git] / drivers / media / video / gspca / m5602 / m5602_po1030.c
index d17ac52..eaddf48 100644 (file)
 
 #include "m5602_po1030.h"
 
+static struct v4l2_pix_format po1030_modes[] = {
+       {
+               640,
+               480,
+               V4L2_PIX_FMT_SBGGR8,
+               V4L2_FIELD_NONE,
+               .sizeimage = 640 * 480,
+               .bytesperline = 640,
+               .colorspace = V4L2_COLORSPACE_SRGB,
+               .priv = 0
+       }
+};
+
+const static struct ctrl po1030_ctrls[] = {
+       {
+               {
+                       .id             = V4L2_CID_GAIN,
+                       .type           = V4L2_CTRL_TYPE_INTEGER,
+                       .name           = "gain",
+                       .minimum        = 0x00,
+                       .maximum        = 0x4f,
+                       .step           = 0x1,
+                       .default_value  = PO1030_GLOBAL_GAIN_DEFAULT,
+                       .flags          = V4L2_CTRL_FLAG_SLIDER
+               },
+               .set = po1030_set_gain,
+               .get = po1030_get_gain
+       }, {
+               {
+                       .id             = V4L2_CID_EXPOSURE,
+                       .type           = V4L2_CTRL_TYPE_INTEGER,
+                       .name           = "exposure",
+                       .minimum        = 0x00,
+                       .maximum        = 0x02ff,
+                       .step           = 0x1,
+                       .default_value  = PO1030_EXPOSURE_DEFAULT,
+                       .flags          = V4L2_CTRL_FLAG_SLIDER
+               },
+               .set = po1030_set_exposure,
+               .get = po1030_get_exposure
+       }, {
+               {
+                       .id             = V4L2_CID_RED_BALANCE,
+                       .type           = V4L2_CTRL_TYPE_INTEGER,
+                       .name           = "red balance",
+                       .minimum        = 0x00,
+                       .maximum        = 0xff,
+                       .step           = 0x1,
+                       .default_value  = PO1030_RED_GAIN_DEFAULT,
+                       .flags          = V4L2_CTRL_FLAG_SLIDER
+               },
+               .set = po1030_set_red_balance,
+               .get = po1030_get_red_balance
+       }, {
+               {
+                       .id             = V4L2_CID_BLUE_BALANCE,
+                       .type           = V4L2_CTRL_TYPE_INTEGER,
+                       .name           = "blue balance",
+                       .minimum        = 0x00,
+                       .maximum        = 0xff,
+                       .step           = 0x1,
+                       .default_value  = PO1030_BLUE_GAIN_DEFAULT,
+                       .flags          = V4L2_CTRL_FLAG_SLIDER
+               },
+               .set = po1030_set_blue_balance,
+               .get = po1030_get_blue_balance
+       }, {
+               {
+                       .id             = V4L2_CID_HFLIP,
+                       .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                       .name           = "horizontal flip",
+                       .minimum        = 0,
+                       .maximum        = 1,
+                       .step           = 1,
+                       .default_value  = 0,
+               },
+               .set = po1030_set_hflip,
+               .get = po1030_get_hflip
+       }, {
+               {
+                       .id             = V4L2_CID_VFLIP,
+                       .type           = V4L2_CTRL_TYPE_BOOLEAN,
+                       .name           = "vertical flip",
+                       .minimum        = 0,
+                       .maximum        = 1,
+                       .step           = 1,
+                       .default_value  = 0,
+               },
+               .set = po1030_set_vflip,
+               .get = po1030_get_vflip
+       }
+};
+
+static void po1030_dump_registers(struct sd *sd);
+
 int po1030_probe(struct sd *sd)
 {
        u8 prod_id = 0, ver_id = 0, i;
@@ -38,16 +133,16 @@ int po1030_probe(struct sd *sd)
        for (i = 0; i < ARRAY_SIZE(preinit_po1030); i++) {
                u8 data = preinit_po1030[i][2];
                if (preinit_po1030[i][0] == SENSOR)
-                       po1030_write_sensor(sd,
+                       m5602_write_sensor(sd,
                                preinit_po1030[i][1], &data, 1);
                else
                        m5602_write_bridge(sd, preinit_po1030[i][1], data);
        }
 
-       if (po1030_read_sensor(sd, 0x3, &prod_id, 1))
+       if (m5602_read_sensor(sd, 0x3, &prod_id, 1))
                return -ENODEV;
 
-       if (po1030_read_sensor(sd, 0x4, &ver_id, 1))
+       if (m5602_read_sensor(sd, 0x4, &ver_id, 1))
                return -ENODEV;
 
        if ((prod_id == 0x02) && (ver_id == 0xef)) {
@@ -57,85 +152,19 @@ int po1030_probe(struct sd *sd)
        return -ENODEV;
 
 sensor_found:
-       sd->gspca_dev.cam.cam_mode = po1030.modes;
-       sd->gspca_dev.cam.nmodes = po1030.nmodes;
-       sd->desc->ctrls = po1030.ctrls;
-       sd->desc->nctrls = po1030.nctrls;
+       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);
        return 0;
 }
 
-int po1030_read_sensor(struct sd *sd, const u8 address,
-                       u8 *i2c_data, const u8 len)
-{
-       int err, i;
-
-       do {
-               err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
-       } while ((*i2c_data & I2C_BUSY) && !err);
-
-       m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
-                          sd->sensor->i2c_slave_id);
-       m5602_write_bridge(sd, M5602_XB_I2C_REG_ADDR, address);
-       m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x10 + len);
-       m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08);
-
-       for (i = 0; i < len; i++) {
-               err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
-
-               PDEBUG(D_CONF, "Reading sensor register "
-                               "0x%x containing 0x%x ", address, *i2c_data);
-       }
-       return (err < 0) ? err : 0;
-}
-
-int po1030_write_sensor(struct sd *sd, const u8 address,
-                       u8 *i2c_data, const u8 len)
-{
-       int err, i;
-       u8 *p;
-       struct usb_device *udev = sd->gspca_dev.dev;
-       __u8 *buf = sd->gspca_dev.usb_buf;
-
-       /* The po1030 only supports one byte writes */
-       if (len > 1 || !len)
-               return -EINVAL;
-
-       memcpy(buf, sensor_urb_skeleton, sizeof(sensor_urb_skeleton));
-
-       buf[11] = sd->sensor->i2c_slave_id;
-       buf[15] = address;
-
-       p = buf + 16;
-
-       /* Copy a four byte write sequence for each byte to be written to */
-       for (i = 0; i < len; i++) {
-               memcpy(p, sensor_urb_skeleton + 16, 4);
-               p[3] = i2c_data[i];
-               p += 4;
-               PDEBUG(D_CONF, "Writing sensor register 0x%x with 0x%x",
-                      address, i2c_data[i]);
-       }
-
-       /* Copy the footer */
-       memcpy(p, sensor_urb_skeleton + 20, 4);
-
-       /* Set the total length */
-       p[3] = 0x10 + len;
-
-       err = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-                             0x04, 0x40, 0x19,
-                             0x0000, buf,
-                             20 + len * 4, M5602_URB_MSG_TIMEOUT);
-
-       return (err < 0) ? err : 0;
-}
-
 int po1030_init(struct sd *sd)
 {
        int i, err = 0;
 
        /* Init the sensor */
-       for (i = 0; i < ARRAY_SIZE(init_po1030); i++) {
+       for (i = 0; i < ARRAY_SIZE(init_po1030) && !err; i++) {
                u8 data[2] = {0x00, 0x00};
 
                switch (init_po1030[i][0]) {
@@ -147,16 +176,10 @@ int po1030_init(struct sd *sd)
 
                case SENSOR:
                        data[0] = init_po1030[i][2];
-                       err = po1030_write_sensor(sd,
+                       err = m5602_write_sensor(sd,
                                init_po1030[i][1], data, 1);
                        break;
 
-               case SENSOR_LONG:
-                       data[0] = init_po1030[i][2];
-                       data[1] = init_po1030[i][3];
-                       err = po1030_write_sensor(sd,
-                               init_po1030[i][1], data, 2);
-                       break;
                default:
                        info("Invalid stream command, exiting init");
                        return -EINVAL;
@@ -166,7 +189,7 @@ int po1030_init(struct sd *sd)
        if (dump_sensor)
                po1030_dump_registers(sd);
 
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
@@ -175,19 +198,19 @@ int po1030_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
        u8 i2c_data;
        int err;
 
-       err = po1030_read_sensor(sd, PO1030_REG_INTEGLINES_H,
+       err = m5602_read_sensor(sd, PO1030_REG_INTEGLINES_H,
                                 &i2c_data, 1);
        if (err < 0)
-               goto out;
+               return err;
        *val = (i2c_data << 8);
 
-       err = po1030_read_sensor(sd, PO1030_REG_INTEGLINES_M,
+       err = m5602_read_sensor(sd, PO1030_REG_INTEGLINES_M,
                                 &i2c_data, 1);
        *val |= i2c_data;
 
        PDEBUG(D_V4L2, "Exposure read as %d", *val);
-out:
-       return (err < 0) ? err : 0;
+
+       return err;
 }
 
 int po1030_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
@@ -202,19 +225,18 @@ int po1030_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
        PDEBUG(D_V4L2, "Set exposure to high byte to 0x%x",
               i2c_data);
 
-       err = po1030_write_sensor(sd, PO1030_REG_INTEGLINES_H,
+       err = m5602_write_sensor(sd, PO1030_REG_INTEGLINES_H,
                                  &i2c_data, 1);
        if (err < 0)
-               goto out;
+               return err;
 
        i2c_data = (val & 0xff);
        PDEBUG(D_V4L2, "Set exposure to low byte to 0x%x",
               i2c_data);
-       err = po1030_write_sensor(sd, PO1030_REG_INTEGLINES_M,
+       err = m5602_write_sensor(sd, PO1030_REG_INTEGLINES_M,
                                  &i2c_data, 1);
 
-out:
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int po1030_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
@@ -223,12 +245,12 @@ int po1030_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
        u8 i2c_data;
        int err;
 
-       err = po1030_read_sensor(sd, PO1030_REG_GLOBALGAIN,
+       err = m5602_read_sensor(sd, PO1030_REG_GLOBALGAIN,
                                 &i2c_data, 1);
        *val = i2c_data;
        PDEBUG(D_V4L2, "Read global gain %d", *val);
 
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int po1030_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
@@ -237,14 +259,14 @@ int po1030_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
        u8 i2c_data;
        int err;
 
-       err = po1030_read_sensor(sd, PO1030_REG_CONTROL2,
+       err = m5602_read_sensor(sd, PO1030_REG_CONTROL2,
                                 &i2c_data, 1);
 
        *val = (i2c_data >> 7) & 0x01 ;
 
        PDEBUG(D_V4L2, "Read hflip %d", *val);
 
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int po1030_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
@@ -254,13 +276,16 @@ int po1030_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
        int err;
 
        PDEBUG(D_V4L2, "Set hflip %d", val);
+       err = m5602_read_sensor(sd, PO1030_REG_CONTROL2, &i2c_data, 1);
+       if (err < 0)
+               return err;
 
-       i2c_data = (val & 0x01) << 7;
+       i2c_data = (0x7f & i2c_data) | ((val & 0x01) << 7);
 
-       err = po1030_write_sensor(sd, PO1030_REG_CONTROL2,
-                                 &i2c_data, 1);
+       err = m5602_write_sensor(sd, PO1030_REG_CONTROL2,
+                                &i2c_data, 1);
 
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int po1030_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
@@ -269,14 +294,14 @@ int po1030_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
        u8 i2c_data;
        int err;
 
-       err = po1030_read_sensor(sd, PO1030_REG_GLOBALGAIN,
+       err = m5602_read_sensor(sd, PO1030_REG_GLOBALGAIN,
                                 &i2c_data, 1);
 
        *val = (i2c_data >> 6) & 0x01;
 
        PDEBUG(D_V4L2, "Read vflip %d", *val);
 
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int po1030_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
@@ -286,13 +311,16 @@ int po1030_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
        int err;
 
        PDEBUG(D_V4L2, "Set vflip %d", val);
+       err = m5602_read_sensor(sd, PO1030_REG_CONTROL2, &i2c_data, 1);
+       if (err < 0)
+               return err;
 
-       i2c_data = (val & 0x01) << 6;
+       i2c_data = (i2c_data & 0xbf) | ((val & 0x01) << 6);
 
-       err = po1030_write_sensor(sd, PO1030_REG_CONTROL2,
-                                 &i2c_data, 1);
+       err = m5602_write_sensor(sd, PO1030_REG_CONTROL2,
+                                &i2c_data, 1);
 
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int po1030_set_gain(struct gspca_dev *gspca_dev, __s32 val)
@@ -303,9 +331,9 @@ int po1030_set_gain(struct gspca_dev *gspca_dev, __s32 val)
 
        i2c_data = val & 0xff;
        PDEBUG(D_V4L2, "Set global gain to %d", i2c_data);
-       err = po1030_write_sensor(sd, PO1030_REG_GLOBALGAIN,
+       err = m5602_write_sensor(sd, PO1030_REG_GLOBALGAIN,
                                  &i2c_data, 1);
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int po1030_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val)
@@ -314,11 +342,11 @@ int po1030_get_red_balance(struct gspca_dev *gspca_dev, __s32 *val)
        u8 i2c_data;
        int err;
 
-       err = po1030_read_sensor(sd, PO1030_REG_RED_GAIN,
+       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 < 0) ? err : 0;
+       return err;
 }
 
 int po1030_set_red_balance(struct gspca_dev *gspca_dev, __s32 val)
@@ -329,9 +357,9 @@ int po1030_set_red_balance(struct gspca_dev *gspca_dev, __s32 val)
 
        i2c_data = val & 0xff;
        PDEBUG(D_V4L2, "Set red gain to %d", i2c_data);
-       err = po1030_write_sensor(sd, PO1030_REG_RED_GAIN,
+       err = m5602_write_sensor(sd, PO1030_REG_RED_GAIN,
                                  &i2c_data, 1);
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int po1030_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val)
@@ -340,12 +368,12 @@ int po1030_get_blue_balance(struct gspca_dev *gspca_dev, __s32 *val)
        u8 i2c_data;
        int err;
 
-       err = po1030_read_sensor(sd, PO1030_REG_BLUE_GAIN,
+       err = m5602_read_sensor(sd, PO1030_REG_BLUE_GAIN,
                                 &i2c_data, 1);
        *val = i2c_data;
        PDEBUG(D_V4L2, "Read blue gain %d", *val);
 
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)
@@ -355,10 +383,10 @@ int po1030_set_blue_balance(struct gspca_dev *gspca_dev, __s32 val)
        int err;
        i2c_data = val & 0xff;
        PDEBUG(D_V4L2, "Set blue gain to %d", i2c_data);
-       err = po1030_write_sensor(sd, PO1030_REG_BLUE_GAIN,
+       err = m5602_write_sensor(sd, PO1030_REG_BLUE_GAIN,
                                  &i2c_data, 1);
 
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int po1030_power_down(struct sd *sd)
@@ -366,14 +394,14 @@ int po1030_power_down(struct sd *sd)
        return 0;
 }
 
-void po1030_dump_registers(struct sd *sd)
+static void po1030_dump_registers(struct sd *sd)
 {
        int address;
        u8 value = 0;
 
        info("Dumping the po1030 sensor core registers");
        for (address = 0; address < 0x7f; address++) {
-               po1030_read_sensor(sd, address, &value, 1);
+               m5602_read_sensor(sd, address, &value, 1);
                info("register 0x%x contains 0x%x",
                     address, value);
        }
@@ -385,9 +413,9 @@ void po1030_dump_registers(struct sd *sd)
                u8 old_value, ctrl_value;
                u8 test_value[2] = {0xff, 0xff};
 
-               po1030_read_sensor(sd, address, &old_value, 1);
-               po1030_write_sensor(sd, address, test_value, 1);
-               po1030_read_sensor(sd, address, &ctrl_value, 1);
+               m5602_read_sensor(sd, address, &old_value, 1);
+               m5602_write_sensor(sd, address, test_value, 1);
+               m5602_read_sensor(sd, address, &ctrl_value, 1);
 
                if (ctrl_value == test_value[0])
                        info("register 0x%x is writeable", address);
@@ -395,6 +423,6 @@ void po1030_dump_registers(struct sd *sd)
                        info("register 0x%x is read only", address);
 
                /* Restore original value */
-               po1030_write_sensor(sd, address, &old_value, 1);
+               m5602_write_sensor(sd, address, &old_value, 1);
        }
 }