[media] mt9t112: mt9t111 format set up differs from mt9t112

The original commit, adding the mt9t112 driver said, that mt9t111 and
mt9t112 had identical register layouts. This however doesn't seem to be
the case. At least pixel format selection in the mt9t111 datasheet is
different from the driver implementation. So far only the default YUYV
format has been verified to work with mt9t111. Limit the driver to only
report one supported format with mt9t111 until more formats are
implemented.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/i2c/soc_camera/mt9t112.c b/drivers/media/i2c/soc_camera/mt9t112.c
index c75d83168700bfc6a8783e1b14122e8506133394..188e29b032733ab10f11620b97c329af3f6abda2 100644 (file)
--- a/drivers/media/i2c/soc_camera/mt9t112.c
+++ b/drivers/media/i2c/soc_camera/mt9t112.c
@@ -92,6 +92,7 @@ struct mt9t112_priv {
        struct v4l2_rect                 frame;
        const struct mt9t112_format     *format;
        int                              model;
+       int                              num_formats;
        u32                              flags;
 /* for flags */
 #define INIT_DONE      (1 << 0)
@@ -859,11 +860,11 @@ static int mt9t112_set_params(struct mt9t112_priv *priv,
        /*
         * get color format
         */
-       for (i = 0; i < ARRAY_SIZE(mt9t112_cfmts); i++)
+       for (i = 0; i < priv->num_formats; i++)
                if (mt9t112_cfmts[i].code == code)
                        break;
 
-       if (i == ARRAY_SIZE(mt9t112_cfmts))
+       if (i == priv->num_formats)
                return -EINVAL;
 
        priv->frame  = *rect;
@@ -955,14 +956,16 @@ static int mt9t112_s_fmt(struct v4l2_subdev *sd,
 static int mt9t112_try_fmt(struct v4l2_subdev *sd,
                           struct v4l2_mbus_framefmt *mf)
 {
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
+       struct mt9t112_priv *priv = to_mt9t112(client);
        unsigned int top, left;
        int i;
 
-       for (i = 0; i < ARRAY_SIZE(mt9t112_cfmts); i++)
+       for (i = 0; i < priv->num_formats; i++)
                if (mt9t112_cfmts[i].code == mf->code)
                        break;
 
-       if (i == ARRAY_SIZE(mt9t112_cfmts)) {
+       if (i == priv->num_formats) {
                mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
                mf->colorspace = V4L2_COLORSPACE_JPEG;
        } else {
@@ -979,7 +982,10 @@ static int mt9t112_try_fmt(struct v4l2_subdev *sd,
 static int mt9t112_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                           enum v4l2_mbus_pixelcode *code)
 {
-       if (index >= ARRAY_SIZE(mt9t112_cfmts))
+       struct i2c_client *client = v4l2_get_subdevdata(sd);
+       struct mt9t112_priv *priv = to_mt9t112(client);
+
+       if (index >= priv->num_formats)
                return -EINVAL;
 
        *code = mt9t112_cfmts[index].code;
@@ -1056,10 +1062,12 @@ static int mt9t112_camera_probe(struct i2c_client *client)
        case 0x2680:
                devname = "mt9t111";
                priv->model = V4L2_IDENT_MT9T111;
+               priv->num_formats = 1;
                break;
        case 0x2682:
                devname = "mt9t112";
                priv->model = V4L2_IDENT_MT9T112;
+               priv->num_formats = ARRAY_SIZE(mt9t112_cfmts);
                break;
        default:
                dev_err(&client->dev, "Product ID error %04x\n", chipid);