[media] v4l: mt9v032: Do not unset master_mode

The power_on function of the driver resets the chip and sets the
CHIP_CONTROL register to 0. This switches the operating mode to slave.
The s_stream function sets the correct mode. But this caused problems on
a board where the camera chip is operated as master. The camera started
after a random amount of time streaming an image, I observed between 10
and 300 seconds.

The STRFM_OUT and STLN_OUT pins are not connected on this board which
may cause some issues in slave mode. I could not find any documentation
about this.

Keeping the chip in master mode after the reset helped to fix this
issue for me.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/i2c/mt9v032.c b/drivers/media/i2c/mt9v032.c
index e47fe40410345741b455bd0aea49be66963b52e7..4a5e0e5f49417d5f131ff17826804c2d8f0a01e9 100644 (file)
--- a/drivers/media/i2c/mt9v032.c
+++ b/drivers/media/i2c/mt9v032.c
@@ -348,7 +348,8 @@ static int mt9v032_power_on(struct mt9v032 *mt9v032)
        if (ret < 0)
                return ret;
 
-       return regmap_write(map, MT9V032_CHIP_CONTROL, 0);
+       return regmap_write(map, MT9V032_CHIP_CONTROL,
+                           MT9V032_CHIP_CONTROL_MASTER_MODE);
 }
 
 static void mt9v032_power_off(struct mt9v032 *mt9v032)
@@ -420,8 +421,7 @@ __mt9v032_get_pad_crop(struct mt9v032 *mt9v032, struct v4l2_subdev_pad_config *c
 
 static int mt9v032_s_stream(struct v4l2_subdev *subdev, int enable)
 {
-       const u16 mode = MT9V032_CHIP_CONTROL_MASTER_MODE
-                      | MT9V032_CHIP_CONTROL_DOUT_ENABLE
+       const u16 mode = MT9V032_CHIP_CONTROL_DOUT_ENABLE
                       | MT9V032_CHIP_CONTROL_SEQUENTIAL;
        struct mt9v032 *mt9v032 = to_mt9v032(subdev);
        struct v4l2_rect *crop = &mt9v032->crop;