1 files changed, 103 insertions, 38 deletions

diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c
index 6b155ae3a746..cb08d00d0a31 100644
--- a/drivers/media/video/gspca/sn9c20x.c
+++ b/drivers/media/video/gspca/sn9c20x.c
@@ -33,6 +33,14 @@ MODULE_LICENSE("GPL");
 
 #define MODULE_NAME "sn9c20x"
 
+/*
+ * Pixel format private data
+ */
+#define SCALE_MASK      0x0f
+#define SCALE_160x120   0
+#define SCALE_320x240   1
+#define SCALE_640x480   2
+#define SCALE_1280x1024 3
 #define MODE_RAW        0x10
 #define MODE_JPEG       0x20
 #define MODE_SXGA       0x80
@@ -348,47 +356,47 @@ static const struct v4l2_pix_format vga_mode[] = {
                 .bytesperline = 160,
                 .sizeimage = 160 * 120 * 4 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
-                .priv = 0 | MODE_JPEG},
+                .priv = SCALE_160x120 | MODE_JPEG},
         {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
                 .bytesperline = 160,
                 .sizeimage = 160 * 120,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 0 | MODE_RAW},
+                .priv = SCALE_160x120 | MODE_RAW},
         {160, 120, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
                 .bytesperline = 160,
                 .sizeimage = 240 * 120,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 0},
+                .priv = SCALE_160x120},
         {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 320,
                 .sizeimage = 320 * 240 * 3 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
-                .priv = 1 | MODE_JPEG},
+                .priv = SCALE_320x240 | MODE_JPEG},
         {320, 240, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
                 .bytesperline = 320,
                 .sizeimage = 320 * 240 ,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 1 | MODE_RAW},
+                .priv = SCALE_320x240 | MODE_RAW},
         {320, 240, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
                 .bytesperline = 320,
                 .sizeimage = 480 * 240 ,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 1},
+                .priv = SCALE_320x240},
         {640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 640,
                 .sizeimage = 640 * 480 * 3 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
-                .priv = 2 | MODE_JPEG},
+                .priv = SCALE_640x480 | MODE_JPEG},
         {640, 480, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
                 .bytesperline = 640,
                 .sizeimage = 640 * 480,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 2 | MODE_RAW},
+                .priv = SCALE_640x480 | MODE_RAW},
         {640, 480, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
                 .bytesperline = 640,
                 .sizeimage = 960 * 480,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 2},
+                .priv = SCALE_640x480},
 };
 
 static const struct v4l2_pix_format sxga_mode[] = {
@@ -396,52 +404,75 @@ static const struct v4l2_pix_format sxga_mode[] = {
                 .bytesperline = 160,
                 .sizeimage = 160 * 120 * 4 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
-                .priv = 0 | MODE_JPEG},
+                .priv = SCALE_160x120 | MODE_JPEG},
         {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
                 .bytesperline = 160,
                 .sizeimage = 160 * 120,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 0 | MODE_RAW},
+                .priv = SCALE_160x120 | MODE_RAW},
         {160, 120, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
                 .bytesperline = 160,
                 .sizeimage = 240 * 120,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 0},
+                .priv = SCALE_160x120},
         {320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 320,
                 .sizeimage = 320 * 240 * 3 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
-                .priv = 1 | MODE_JPEG},
+                .priv = SCALE_320x240 | MODE_JPEG},
         {320, 240, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
                 .bytesperline = 320,
                 .sizeimage = 320 * 240 ,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 1 | MODE_RAW},
+                .priv = SCALE_320x240 | MODE_RAW},
         {320, 240, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
                 .bytesperline = 320,
                 .sizeimage = 480 * 240 ,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 1},
+                .priv = SCALE_320x240},
         {640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
                 .bytesperline = 640,
                 .sizeimage = 640 * 480 * 3 / 8 + 590,
                 .colorspace = V4L2_COLORSPACE_JPEG,
-                .priv = 2 | MODE_JPEG},
+                .priv = SCALE_640x480 | MODE_JPEG},
         {640, 480, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
                 .bytesperline = 640,
                 .sizeimage = 640 * 480,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 2 | MODE_RAW},
+                .priv = SCALE_640x480 | MODE_RAW},
         {640, 480, V4L2_PIX_FMT_SN9C20X_I420, V4L2_FIELD_NONE,
                 .bytesperline = 640,
                 .sizeimage = 960 * 480,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 2},
+                .priv = SCALE_640x480},
         {1280, 1024, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
                 .bytesperline = 1280,
                 .sizeimage = 1280 * 1024,
                 .colorspace = V4L2_COLORSPACE_SRGB,
-                .priv = 3 | MODE_RAW | MODE_SXGA},
+                .priv = SCALE_1280x1024 | MODE_RAW | MODE_SXGA},
+};
+
+static const struct v4l2_pix_format mono_mode[] = {
+        {160, 120, V4L2_PIX_FMT_GREY, V4L2_FIELD_NONE,
+                .bytesperline = 160,
+                .sizeimage = 160 * 120,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = SCALE_160x120 | MODE_RAW},
+        {320, 240, V4L2_PIX_FMT_GREY, V4L2_FIELD_NONE,
+                .bytesperline = 320,
+                .sizeimage = 320 * 240 ,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = SCALE_320x240 | MODE_RAW},
+        {640, 480, V4L2_PIX_FMT_GREY, V4L2_FIELD_NONE,
+                .bytesperline = 640,
+                .sizeimage = 640 * 480,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = SCALE_640x480 | MODE_RAW},
+        {1280, 1024, V4L2_PIX_FMT_GREY, V4L2_FIELD_NONE,
+                .bytesperline = 1280,
+                .sizeimage = 1280 * 1024,
+                .colorspace = V4L2_COLORSPACE_SRGB,
+                .priv = SCALE_1280x1024 | MODE_RAW | MODE_SXGA},
 };
 
 static const s16 hsv_red_x[] = {
@@ -1029,16 +1060,19 @@ static struct i2c_reg_u16 mt9v011_init[] = {
 };
 
 static struct i2c_reg_u16 mt9m001_init[] = {
-        {0x0d, 0x0001}, {0x0d, 0x0000}, {0x01, 0x000e},
-        {0x02, 0x0014}, {0x03, 0x03c1}, {0x04, 0x0501},
-        {0x05, 0x0083}, {0x06, 0x0006}, {0x0d, 0x0002},
-        {0x0a, 0x0000}, {0x0c, 0x0000}, {0x11, 0x0000},
-        {0x1e, 0x8000}, {0x5f, 0x8904}, {0x60, 0x0000},
-        {0x61, 0x0000}, {0x62, 0x0498}, {0x63, 0x0000},
-        {0x64, 0x0000}, {0x20, 0x111d}, {0x06, 0x00f2},
-        {0x05, 0x0013}, {0x09, 0x10f2}, {0x07, 0x0003},
-        {0x2b, 0x002a}, {0x2d, 0x002a}, {0x2c, 0x002a},
-        {0x2e, 0x0029}, {0x07, 0x0002},
+        {0x0d, 0x0001},
+        {0x0d, 0x0000},
+        {0x04, 0x0500},         /* hres = 1280 */
+        {0x03, 0x0400},         /* vres = 1024 */
+        {0x20, 0x1100},
+        {0x06, 0x0010},
+        {0x2b, 0x0024},
+        {0x2e, 0x0024},
+        {0x35, 0x0024},
+        {0x2d, 0x0020},
+        {0x2c, 0x0020},
+        {0x09, 0x0ad4},
+        {0x35, 0x0057},
 };
 
 static struct i2c_reg_u16 mt9m111_init[] = {
@@ -1224,8 +1258,17 @@ static int i2c_r2(struct gspca_dev *gspca_dev, u8 reg, u16 *val)
 static int ov9650_init_sensor(struct gspca_dev *gspca_dev)
 {
         int i;
+        u16 id;
         struct sd *sd = (struct sd *) gspca_dev;
 
+        if (i2c_r2(gspca_dev, 0x1c, &id) < 0)
+                return -EINVAL;
+
+        if (id != 0x7fa2) {
+                err("sensor id for ov9650 doesn't match (0x%04x)", id);
+                return -ENODEV;
+        }
+
         for (i = 0; i < ARRAY_SIZE(ov9650_init); i++) {
                 if (i2c_w1(gspca_dev, ov9650_init[i].reg,
                                 ov9650_init[i].val) < 0) {
@@ -1425,6 +1468,25 @@ static int mt9m001_init_sensor(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         int i;
+        u16 id;
+
+        if (i2c_r2(gspca_dev, 0x00, &id) < 0)
+                return -EINVAL;
+
+        /* must be 0x8411 or 0x8421 for colour sensor and 8431 for bw */
+        switch (id) {
+        case 0x8411:
+        case 0x8421:
+                info("MT9M001 color sensor detected");
+                break;
+        case 0x8431:
+                info("MT9M001 mono sensor detected");
+                break;
+        default:
+                err("No MT9M001 chip detected, ID = %x\n", id);
+                return -ENODEV;
+        }
+
         for (i = 0; i < ARRAY_SIZE(mt9m001_init); i++) {
                 if (i2c_w2(gspca_dev, mt9m001_init[i].reg,
                                 mt9m001_init[i].val) < 0) {
@@ -1434,8 +1496,8 @@ static int mt9m001_init_sensor(struct gspca_dev *gspca_dev)
         }
         /* disable hflip and vflip */
         gspca_dev->ctrl_dis = (1 << HFLIP_IDX) | (1 << VFLIP_IDX);
-        sd->hstart = 2;
-        sd->vstart = 2;
+        sd->hstart = 1;
+        sd->vstart = 1;
         return 0;
 }
 
@@ -1977,6 +2039,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
                 cam->cam_mode = sxga_mode;
                 cam->nmodes = ARRAY_SIZE(sxga_mode);
                 break;
+        case SENSOR_MT9M001:
+                cam->cam_mode = mono_mode;
+                cam->nmodes = ARRAY_SIZE(mono_mode);
+                break;
         default:
                 cam->cam_mode = vga_mode;
                 cam->nmodes = ARRAY_SIZE(vga_mode);
@@ -2075,7 +2141,6 @@ static int sd_init(struct gspca_dev *gspca_dev)
         case SENSOR_MT9M001:
                 if (mt9m001_init_sensor(gspca_dev) < 0)
                         return -ENODEV;
-                info("MT9M001 sensor detected");
                 break;
         case SENSOR_HV7131R:
                 if (hv7131r_init_sensor(gspca_dev) < 0)
@@ -2173,22 +2238,22 @@ static int sd_start(struct gspca_dev *gspca_dev)
         else if (mode & MODE_JPEG)
                 fmt = 0x2c;
         else
-                fmt = 0x2f;
+                fmt = 0x2f;     /* YUV 420 */
 
-        switch (mode & 0x0f) {
-        case 3:
+        switch (mode & SCALE_MASK) {
+        case SCALE_1280x1024:
                 scale = 0xc0;
                 info("Set 1280x1024");
                 break;
-        case 2:
+        case SCALE_640x480:
                 scale = 0x80;
                 info("Set 640x480");
                 break;
-        case 1:
+        case SCALE_320x240:
                 scale = 0x90;
                 info("Set 320x240");
                 break;
-        case 0:
+        case SCALE_160x120:
                 scale = 0xa0;
                 info("Set 160x120");
                 break;